From d4a64aa24f7f907700bfe66fc63108d69c2549ae Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 15 May 2021 01:53:39 +0200 Subject: [PATCH 1/3] home-assistant: 2021.5.3 -> 2021.5.4 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 844ea8976d7c1a..e97bbae7f74ace 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.5.3"; + version = "2021.5.4"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 7616dc0ee879b4..e19919bf4f8cbf 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -114,7 +114,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.5.3"; + hassVersion = "2021.5.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -133,7 +133,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1zc21d70n24sk8y42xq3gzisj44kn6w6fhgqrcani470hhph24ba"; + sha256 = "1jxbxzhcnvxf6qkik2qmpdml41q6hlkazjqaxygyw7pyj094fp8v"; }; # leave this in, so users don't have to constantly update their downstream patch handling From bdabf32fdd0e9f8102d9c22fa20dde45054a6081 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 15 May 2021 16:56:35 +0200 Subject: [PATCH 2/3] home-assistant: print full variables on test error --- pkgs/servers/home-assistant/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e19919bf4f8cbf..d3aa10620b8ff4 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -425,6 +425,8 @@ in with py.pkgs; buildPythonApplication rec { "--only-rerun RuntimeError" # assign tests grouped by file to workers "--dist loadfile" + # enable full variable printing on error + "--showlocals" # tests are located in tests/ "tests" # screenlogic/test_config_flow.py: Tries to send out UDP broadcasts From 22437644f997050b4077fe52d5bf8e41434f26e6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 May 2021 03:41:47 +0200 Subject: [PATCH 3/3] home-assistant: disable failing test in mobile app component ____________________ test_webhook_handle_get_config[pyloop] ____________________ [gw18] linux -- Python 3.8.9 /nix/store/q6gfck5czr67090pwm53xrdyhpg6bx67-python3-3.8.9/bin/python3.8 hass = create_registrations = ({'cloudhook_url': None, 'remote_ui_url': None, 'secret': 'ed8ac650f2b5865733d2cea4ad1b6b02bcfbdcc3e527524bc1c457d5c6f...emote_ui_url': None, 'secret': None, 'webhook_id': '558fde83113d48024a427ccf004e2d2bdf7c56646c6a5a953566c272d51f1bfc'}) webhook_client = async def test_webhook_handle_get_config(hass, create_registrations, webhook_client): """Test that we can get config properly.""" resp = await webhook_client.post( "/api/webhook/{}".format(create_registrations[1]["webhook_id"]), json={"type": "get_config"}, ) assert resp.status == 200 json = await resp.json() if "components" in json: json["components"] = set(json["components"]) if "allowlist_external_dirs" in json: json["allowlist_external_dirs"] = set(json["allowlist_external_dirs"]) hass_config = hass.config.as_dict() expected_dict = { "latitude": hass_config["latitude"], "longitude": hass_config["longitude"], "elevation": hass_config["elevation"], "unit_system": hass_config["unit_system"], "location_name": hass_config["location_name"], "time_zone": hass_config["time_zone"], "components": hass_config["components"], "version": hass_config["version"], "theme_color": "#03A9F4", # Default frontend theme color } > assert expected_dict == json E AssertionError: assert {'components'...st home', ...} == {'components'...st home', ...} E Omitting 8 identical items, use -vv to show E Differing items: E {'theme_color': '#03A9F4'} != {'theme_color': 'blue'} E Use -v to get the full diff tests/components/mobile_app/test_webhook.py:231: AssertionError --- pkgs/servers/home-assistant/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index d3aa10620b8ff4..3a8948f8982a34 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -457,6 +457,8 @@ in with py.pkgs; buildPythonApplication rec { "test_check_package_version_does_not_match" # homeassistant/util/thread.py:51: SystemError "test_executor_shutdown_can_interrupt_threads" + # {'theme_color': '#03A9F4'} != {'theme_color': 'blue'} + "test_webhook_handle_get_config" ]; preCheck = ''