updates tests for python 3.10 and HA 2023.3.6

Author: craigbarratt

.github/workflows/validate.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: "actions/checkout@v2"
       - uses: "actions/setup-python@v1"
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - run: python3 -m pip install black
       - run: black .
 
@@ -29,7 +29,7 @@ jobs:
       - uses: "actions/checkout@v2"
       - uses: "actions/setup-python@v1"
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - run: python3 -m pip install -r tests/requirements_test.txt
       - run: pytest --cov=custom_components
 
@@ -40,7 +40,7 @@ jobs:
       - uses: "actions/checkout@v2"
       - uses: "actions/setup-python@v1"
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - run: python3 -m pip install -r tests/requirements_test.txt
       - run: pylint custom_components/pyscript/*.py tests/*.py
 
@@ -51,6 +51,6 @@ jobs:
       - uses: "actions/checkout@v2"
       - uses: "actions/setup-python@v1"
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - run: python3 -m pip install -r tests/requirements_test.txt
       - run: mypy custom_components/pyscript/*.py tests/*.py

custom_components/pyscript/function.py

@@ -463,6 +463,12 @@ def service_register(cls, global_ctx_name, domain, service, callback):
             )
         cls.service_cnt[key] += 1
         cls.hass.services.async_register(domain, service, callback)
+        _LOGGER.info(
+            "TESTXX service_register: %s.%s, %s",
+            domain,
+            service,
+            cls.hass.services.has_service(domain, service),
+        )
 
     @classmethod
     def service_remove(cls, global_ctx_name, domain, service):

tests/requirements_test.txt

@@ -1,11 +1,11 @@
-coverage>=6.3.1
-croniter>=1.3.8
-watchdog>=2.0.3
+coverage==7.1.0
+croniter==1.3.8
+watchdog==2.1.9
 mock-open==1.4.0
-mypy>=0.991
-pre-commit>=2.21.0
-pytest>=7.0.1
-pytest-cov>=2.9.0
-pytest-homeassistant-custom-component==0.11.26
-pylint>=2.15.0
-pylint-strict-informational>=0.1
+mypy==1.1.1
+pre-commit==3.2.1
+pytest==7.2.1
+pytest-cov==3.0.0
+pytest-homeassistant-custom-component==0.13.10
+pylint==2.17.1
+pylint-strict-informational==0.1

tests/test_apps_modules.py

@@ -5,9 +5,10 @@
 import re
 from unittest.mock import patch
 
-from custom_components.pyscript.const import DOMAIN, FOLDER
 from mock_open import MockOpen
+import pytest
 
+from custom_components.pyscript.const import DOMAIN, FOLDER
 from homeassistant.const import EVENT_STATE_CHANGED
 from homeassistant.setup import async_setup_component
 
@@ -17,6 +18,7 @@ async def wait_until_done(notify_q):
     return await asyncio.wait_for(notify_q.get(), timeout=4)
 
 
+@pytest.mark.asyncio
 async def test_service_exists(hass, caplog):
     """Test importing a pyscript module."""
 
@@ -148,7 +150,7 @@ def func15():
     def isfile_side_effect(arg):
         return arg in file_contents
 
-    def glob_side_effect(path, recursive=None):
+    def glob_side_effect(path, recursive=None, root_dir=None, dir_fd=None, include_hidden=False):
         result = []
         path_re = path.replace("*", "[^/]*").replace(".", "\\.")
         path_re = path_re.replace("[^/]*[^/]*/", ".*")
@@ -190,6 +192,7 @@ async def state_changed(event):
 
     assert not hass.services.has_service("pyscript", "func10")
     assert not hass.services.has_service("pyscript", "func11")
+    assert hass.services.has_service("pyscript", "func1")
     assert hass.services.has_service("pyscript", "func13")
     assert hass.services.has_service("pyscript", "func14")
     assert not hass.services.has_service("pyscript", "func15")
@@ -205,4 +208,5 @@ async def state_changed(event):
     assert "modules/xyz2 global_ctx=modules.xyz2;" in caplog.text
     assert "func14 global_ctx=scripts.a.b.c.d.func14;" in caplog.text
     assert "ModuleNotFoundError: import of no_such_package not allowed" in caplog.text
-    assert "SyntaxError: invalid syntax (bad_module.py, line 2)" in caplog.text
+    # assert "SyntaxError: invalid syntax (bad_module.py, line 2)" in caplog.text    # <= 3.9
+    assert "SyntaxError: expected ':' (bad_module.py, line 2)" in caplog.text

tests/test_config_flow.py

@@ -1,11 +1,12 @@
 """Tests for pyscript config flow."""
+
 import logging
 from unittest.mock import patch
 
-from custom_components.pyscript import PYSCRIPT_SCHEMA
-from custom_components.pyscript.const import CONF_ALLOW_ALL_IMPORTS, CONF_HASS_IS_GLOBAL, DOMAIN
 import pytest
 
+from custom_components.pyscript import PYSCRIPT_SCHEMA
+from custom_components.pyscript.const import CONF_ALLOW_ALL_IMPORTS, CONF_HASS_IS_GLOBAL, DOMAIN
 from homeassistant import data_entry_flow
 from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER
 
@@ -20,6 +21,7 @@ def pyscript_bypass_setup_fixture():
         yield
 
 
+@pytest.mark.asyncio
 async def test_user_flow_minimum_fields(hass, pyscript_bypass_setup):
     """Test user config flow with minimum fields."""
     # test form shows
@@ -36,6 +38,7 @@ async def test_user_flow_minimum_fields(hass, pyscript_bypass_setup):
     assert not result["data"][CONF_HASS_IS_GLOBAL]
 
 
+@pytest.mark.asyncio
 async def test_user_flow_all_fields(hass, pyscript_bypass_setup):
     """Test user config flow with all fields."""
     # test form shows
@@ -54,6 +57,7 @@ async def test_user_flow_all_fields(hass, pyscript_bypass_setup):
     assert result["data"][CONF_HASS_IS_GLOBAL]
 
 
+@pytest.mark.asyncio
 async def test_user_already_configured(hass, pyscript_bypass_setup):
     """Test service is already configured during user setup."""
     result = await hass.config_entries.flow.async_init(
@@ -74,6 +78,7 @@ async def test_user_already_configured(hass, pyscript_bypass_setup):
     assert result["reason"] == "single_instance_allowed"
 
 
+@pytest.mark.asyncio
 async def test_import_flow(hass, pyscript_bypass_setup):
     """Test import config flow works."""
     result = await hass.config_entries.flow.async_init(
@@ -83,6 +88,7 @@ async def test_import_flow(hass, pyscript_bypass_setup):
     assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
 
 
+@pytest.mark.asyncio
 async def test_import_flow_update_allow_all_imports(hass, pyscript_bypass_setup):
     """Test import config flow updates existing entry when `allow_all_imports` has changed."""
     result = await hass.config_entries.flow.async_init(
@@ -101,6 +107,7 @@ async def test_import_flow_update_allow_all_imports(hass, pyscript_bypass_setup)
     assert result["reason"] == "updated_entry"
 
 
+@pytest.mark.asyncio
 async def test_import_flow_update_apps_from_none(hass, pyscript_bypass_setup):
     """Test import config flow updates existing entry when `apps` has changed from None to something."""
     result = await hass.config_entries.flow.async_init(
@@ -117,6 +124,7 @@ async def test_import_flow_update_apps_from_none(hass, pyscript_bypass_setup):
     assert result["reason"] == "updated_entry"
 
 
+@pytest.mark.asyncio
 async def test_import_flow_update_apps_to_none(hass, pyscript_bypass_setup):
     """Test import config flow updates existing entry when `apps` has changed from something to None."""
     result = await hass.config_entries.flow.async_init(
@@ -131,6 +139,7 @@ async def test_import_flow_update_apps_to_none(hass, pyscript_bypass_setup):
     assert result["reason"] == "updated_entry"
 
 
+@pytest.mark.asyncio
 async def test_import_flow_no_update(hass, pyscript_bypass_setup):
     """Test import config flow doesn't update existing entry when data is same."""
     result = await hass.config_entries.flow.async_init(
@@ -147,6 +156,7 @@ async def test_import_flow_no_update(hass, pyscript_bypass_setup):
     assert result["reason"] == "already_configured"
 
 
+@pytest.mark.asyncio
 async def test_import_flow_update_user(hass, pyscript_bypass_setup):
     """Test import config flow update excludes `allow_all_imports` from being updated when updated entry was a user entry."""
     result = await hass.config_entries.flow.async_init(
@@ -171,6 +181,7 @@ async def test_import_flow_update_user(hass, pyscript_bypass_setup):
     }
 
 
+@pytest.mark.asyncio
 async def test_import_flow_update_import(hass, pyscript_bypass_setup):
     """Test import config flow update includes `allow_all_imports` in update when updated entry was imported entry."""
     result = await hass.config_entries.flow.async_init(
@@ -191,6 +202,7 @@ async def test_import_flow_update_import(hass, pyscript_bypass_setup):
     assert hass.config_entries.async_entries(DOMAIN)[0].data == {"apps": {"test_app": {"param": 1}}}
 
 
+@pytest.mark.asyncio
 async def test_options_flow_import(hass, pyscript_bypass_setup):
     """Test options flow aborts because configuration needs to be managed via configuration.yaml."""
     result = await hass.config_entries.flow.async_init(
@@ -213,6 +225,7 @@ async def test_options_flow_import(hass, pyscript_bypass_setup):
     assert result["title"] == ""
 
 
+@pytest.mark.asyncio
 async def test_options_flow_user_change(hass, pyscript_bypass_setup):
     """Test options flow updates config entry when options change."""
     result = await hass.config_entries.flow.async_init(
@@ -241,6 +254,7 @@ async def test_options_flow_user_change(hass, pyscript_bypass_setup):
     assert entry.data[CONF_HASS_IS_GLOBAL] is False
 
 
+@pytest.mark.asyncio
 async def test_options_flow_user_no_change(hass, pyscript_bypass_setup):
     """Test options flow aborts when options don't change."""
     result = await hass.config_entries.flow.async_init(
@@ -270,6 +284,7 @@ async def test_options_flow_user_no_change(hass, pyscript_bypass_setup):
     assert result["title"] == ""
 
 
+@pytest.mark.asyncio
 async def test_config_entry_reload(hass):
     """Test that config entry reload does not duplicate listeners."""
     with patch("homeassistant.config.load_yaml_config_file", return_value={}), patch(

tests/test_decorator_errors.py

@@ -4,6 +4,8 @@
 from datetime import datetime as dt
 from unittest.mock import mock_open, patch
 
+import pytest
+
 from custom_components.pyscript import trigger
 from custom_components.pyscript.const import DOMAIN
 from custom_components.pyscript.function import Function
@@ -70,6 +72,7 @@ async def wait_until_done(notify_q):
     return await asyncio.wait_for(notify_q.get(), timeout=4)
 
 
+@pytest.mark.asyncio
 async def test_decorator_errors(hass, caplog):
     """Test decorator syntax and run-time errors."""
     notify_q = asyncio.Queue(0)
@@ -164,11 +167,13 @@ def func8():
     assert literal_eval(await wait_until_done(notify_q)) == seq_num
 
     assert (
-        "SyntaxError: unexpected EOF while parsing (file.hello.func1 @state_trigger(), line 1)"
+        # "SyntaxError: unexpected EOF while parsing (file.hello.func1 @state_trigger(), line 1)"   # <= 3.9
+        "SyntaxError: invalid syntax (file.hello.func1 @state_trigger(), line 1)"  # >= 3.10
         in caplog.text
     )
     assert (
-        "SyntaxError: unexpected EOF while parsing (file.hello.func2 @event_trigger(), line 1)"
+        # "SyntaxError: unexpected EOF while parsing (file.hello.func2 @event_trigger(), line 1)"  # <= 3.9
+        "SyntaxError: '(' was never closed (file.hello.func2 @event_trigger(), line 1)"  # >= 3.10
         in caplog.text
     )
     assert "SyntaxError: invalid syntax (file.hello.func3 @state_active(), line 1)" in caplog.text
@@ -192,10 +197,12 @@ def func8():
         in caplog.text
     )
 
-    assert "unexpected EOF while parsing (file.hello.func7 state_trigger, line 1)" in caplog.text
+    # assert "unexpected EOF while parsing (file.hello.func7 state_trigger, line 1)" in caplog.text   # <= 3.9
+    assert "invalid syntax (file.hello.func7 state_trigger, line 1)" in caplog.text
     assert 'can only concatenate str (not "int") to str' in caplog.text
 
 
+@pytest.mark.asyncio
 async def test_decorator_errors_missing_trigger(hass, caplog):
     """Test decorator syntax and run-time errors."""
     notify_q = asyncio.Queue(0)
@@ -215,6 +222,7 @@ def func4():
     )
 
 
+@pytest.mark.asyncio
 async def test_decorator_errors_missing_arg(hass, caplog):
     """Test decorator syntax and run-time errors."""
     notify_q = asyncio.Queue(0)
@@ -234,6 +242,7 @@ def func8():
     )
 
 
+@pytest.mark.asyncio
 async def test_decorator_errors_missing_arg2(hass, caplog):
     """Test decorator syntax and run-time errors."""
     notify_q = asyncio.Queue(0)
@@ -253,6 +262,7 @@ def func9():
     )
 
 
+@pytest.mark.asyncio
 async def test_decorator_errors_bad_arg_type(hass, caplog):
     """Test decorator syntax and run-time errors."""
     notify_q = asyncio.Queue(0)
@@ -272,6 +282,7 @@ def func10():
     )
 
 
+@pytest.mark.asyncio
 async def test_decorator_errors_bad_arg_type2(hass, caplog):
     """Test decorator syntax and run-time errors."""
     notify_q = asyncio.Queue(0)
@@ -291,6 +302,7 @@ def func11():
     )
 
 
+@pytest.mark.asyncio
 async def test_service_reload_error(hass, caplog):
     """Test using a reserved name generates an error."""
 
@@ -310,6 +322,7 @@ def reload():
     )
 
 
+@pytest.mark.asyncio
 async def test_service_state_active_extra_args(hass, caplog):
     """Test using extra args to state_active generates an error."""
 
@@ -329,6 +342,7 @@ def func4():
     )
 
 
+@pytest.mark.asyncio
 async def test_service_wrong_arg_type(hass, caplog):
     """Test using too many args with service an error."""
 
@@ -348,6 +362,7 @@ def func5():
     )
 
 
+@pytest.mark.asyncio
 async def test_time_trigger_wrong_arg_type(hass, caplog):
     """Test using wrong argument type generates an error."""
 
@@ -367,6 +382,7 @@ def func6():
     )
 
 
+@pytest.mark.asyncio
 async def test_decorator_kwargs(hass, caplog):
     """Test invalid keyword arguments generates an error."""
 
@@ -386,6 +402,7 @@ def func7():
     )
 
 
+@pytest.mark.asyncio
 async def test_decorator_kwargs2(hass, caplog):
     """Test invalid keyword arguments generates an error."""
 
@@ -405,6 +422,7 @@ def func7():
     )
 
 
+@pytest.mark.asyncio
 async def test_decorator_kwargs3(hass, caplog):
     """Test invalid keyword arguments type generates an error."""
 
@@ -424,6 +442,7 @@ def func7():
     )
 
 
+@pytest.mark.asyncio
 async def test_decorator_kwargs4(hass, caplog):
     """Test invalid keyword arguments type generates an error."""