summary refs log tree commit diff
path: root/pkgs/servers/home-assistant
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2022-01-28 22:59:53 +0100
committerMartin Weinelt <hexa@darmstadt.ccc.de>2022-02-15 23:15:16 +0100
commit82f0df4d688315fd0ce4d4e850fc4dab47ee5741 (patch)
tree4407bf0126d773e7da3c340a59e9483104a2336c /pkgs/servers/home-assistant
parent5aabba490e4a6001b9bda3f485210cdbec7e2d28 (diff)
downloadnixpkgs-82f0df4d688315fd0ce4d4e850fc4dab47ee5741.tar
nixpkgs-82f0df4d688315fd0ce4d4e850fc4dab47ee5741.tar.gz
nixpkgs-82f0df4d688315fd0ce4d4e850fc4dab47ee5741.tar.bz2
nixpkgs-82f0df4d688315fd0ce4d4e850fc4dab47ee5741.tar.lz
nixpkgs-82f0df4d688315fd0ce4d4e850fc4dab47ee5741.tar.xz
nixpkgs-82f0df4d688315fd0ce4d4e850fc4dab47ee5741.tar.zst
nixpkgs-82f0df4d688315fd0ce4d4e850fc4dab47ee5741.zip
home-assistant: drop patch that ignores OSErrors in hass fixture
I doesn't seem to be needed anymore. I built all tests and didn't
experience any failures that could've been prevent by it.
Diffstat (limited to 'pkgs/servers/home-assistant')
-rw-r--r--pkgs/servers/home-assistant/default.nix1
-rw-r--r--pkgs/servers/home-assistant/patches/tests-ignore-OSErrors-in-hass-fixture.patch27
2 files changed, 0 insertions, 28 deletions
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 3d446f1f274..14156f8c24b 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -158,7 +158,6 @@ in python.pkgs.buildPythonApplication rec {
       src = ./patches/ffmpeg-path.patch;
       ffmpeg = "${lib.getBin ffmpeg}/bin/ffmpeg";
     })
-    ./patches/tests-ignore-OSErrors-in-hass-fixture.patch
   ];
 
   postPatch = let
diff --git a/pkgs/servers/home-assistant/patches/tests-ignore-OSErrors-in-hass-fixture.patch b/pkgs/servers/home-assistant/patches/tests-ignore-OSErrors-in-hass-fixture.patch
deleted file mode 100644
index add0ea1d552..00000000000
--- a/pkgs/servers/home-assistant/patches/tests-ignore-OSErrors-in-hass-fixture.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3e3f5c37252a33ea1e71c39f2ca0f13940c261ad Mon Sep 17 00:00:00 2001
-From: Martin Weinelt <hexa@darmstadt.ccc.de>
-Date: Sat, 17 Jul 2021 16:11:23 +0200
-Subject: [PATCH] tests: ignore OSErrors in hass fixture
-
-The nix sandbox will cause OSErrors due to limitations imposed on
-network interaction. This change makes it so we forgive these cases.
----
- tests/conftest.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 1f5ffc80d0..b284727a0f 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -168,6 +168,8 @@ def hass(loop, load_registries, hass_storage, request):
-             continue
-         if isinstance(ex, ServiceNotFound):
-             continue
-+        if isinstance(ex, OSError):
-+            continue
-         raise ex
- 
- 
--- 
-2.32.0
-