bumped some test requirements, runs with python 3.11.3

Author: craigbarratt

custom_components/pyscript/jupyter_kernel.py

@@ -746,7 +746,7 @@ async def housekeep_run(self):
                         await asyncio.sleep(10000)
                 elif msg[0] == "shutdown":
                     asyncio.create_task(self.session_shutdown())
-                    await asyncio.sleep(10000)
+                    return
             except asyncio.CancelledError:
                 raise
             except Exception:

tests/requirements_test.txt

@@ -1,11 +1,11 @@
-coverage==7.1.0
+coverage==7.2.1
 croniter==1.3.8
 watchdog==2.1.9
 mock-open==1.4.0
-mypy==1.1.1
+mypy==1.3.0
 pre-commit==3.2.1
-pytest==7.2.1
+pytest==7.2.2
 pytest-cov==3.0.0
-pytest-homeassistant-custom-component==0.13.10
-pylint==2.17.1
+pytest-homeassistant-custom-component==0.13.23
+pylint==2.17.4
 pylint-strict-informational==0.1

tests/test_function.py

@@ -308,17 +308,19 @@ def func4a_hold_false():
 
 @service
 def func4b_hold_false():
-    global seq_num
+    global seq_num, func4b_hold_false_id
 
+    func4b_hold_false_id = task.current_task()
     while 1:
         seq_num += 1
         res = task.wait_until(state_trigger="int(pyscript.f4bvar2) >= 10", state_hold_false=0, __test_handshake__=["pyscript.done2", seq_num], state_check_now=False)
         pyscript.done = [seq_num, res["value"]]
 
 @service
 def func4c_hold_false():
-    global seq_num
+    global seq_num, func4c_hold_false_id
 
+    func4c_hold_false_id = task.current_task()
     while 1:
         # this should never trigger
         seq_num += 1
@@ -411,6 +413,17 @@ def func9(var_name=None, value=None, old_value=None):
     seq_num += 1
     log.info(f"func9 var = {var_name}, value = {value}")
     pyscript.done = [seq_num, var_name, value, old_value]
+
+@service
+def service_cleanup():
+    global seq_num
+
+    seq_num += 1
+    task.cancel(func4c_hold_false_id)
+    task.cancel(func4b_hold_false_id)
+    log.info(f"service_cleanup seq_num = {seq_num}")
+    pyscript.done = [seq_num]
+
 """,
     )
     # initialize the trigger and active variables
@@ -704,6 +717,10 @@ def func9(var_name=None, value=None, old_value=None):
     seq_num += 1
     assert literal_eval(await wait_until_done(notify_q2)) == seq_num
 
+    seq_num += 1
+    await hass.services.async_call("pyscript", "service_cleanup", {})
+    assert literal_eval(await wait_until_done(notify_q)) == [seq_num]
+
 
 @pytest.mark.asyncio
 async def test_state_trigger_time(hass, caplog):
@@ -1252,7 +1269,7 @@ async def test_service_call_blocking(hass, caplog):
 
 @time_trigger("startup")
 def func_startup():
-    global seq_num
+    global seq_num, long_sleep_id
 
     seq_num += 1
     pyscript.var1 = 1
@@ -1272,11 +1289,15 @@ def func_startup():
     service.call("pyscript", "long_sleep", blocking=True, limit=1e-6)
     pyscript.done = [seq_num, pyscript.var1]
 
+    task.cancel(long_sleep_id)
     seq_num += 1
     pyscript.done = [seq_num]
 
 @service
 def long_sleep():
+    global long_sleep_id
+
+    long_sleep_id = task.current_task()
     task.sleep(10000)
 
 @service

tests/test_jupyter.py

@@ -15,6 +15,7 @@
 
 from custom_components.pyscript import trigger
 from custom_components.pyscript.const import DOMAIN, FOLDER
+from custom_components.pyscript.function import Function
 from custom_components.pyscript.jupyter_kernel import ZmqSocket
 from homeassistant.const import EVENT_HOMEASSISTANT_STARTED, EVENT_HOMEASSISTANT_STOP
 from homeassistant.setup import async_setup_component
@@ -565,3 +566,6 @@ async def test_jupyter_kernel_no_connection_timeout(hass, caplog, socket_enabled
         await asyncio.sleep(2e-3)
 
     assert "No connections to session jupyter_" in caplog.text
+    await Function.waiter_sync()
+    await Function.waiter_stop()
+    await Function.reaper_stop()

tests/test_unique.py

@@ -79,11 +79,12 @@ async def test_task_unique(hass, caplog):
 
 @time_trigger("startup")
 def funcStartupSync():
-    global seq_num
+    global seq_num, funcStartupSync_id
 
     seq_num += 1
     log.info(f"funcStartupSync setting pyscript.done = {seq_num}")
     pyscript.done = seq_num
+    funcStartupSync_id = task.current_task()
     #
     # stick around so the task.unique() still applies
     #
@@ -92,6 +93,15 @@ def funcStartupSync():
     assert task.current_task() == task.name2id()["func6"]
     task.sleep(10000)
 
+@service
+def service_cleanup():
+    global seq_num
+
+    seq_num += 1
+    task.cancel(funcStartupSync_id)
+    log.info(f"service_cleanup seq_num = {seq_num}")
+    pyscript.done = [seq_num]
+
 @state_trigger("pyscript.f0var1 == '1'")
 def func0(var_name=None, value=None):
     global seq_num
@@ -290,3 +300,7 @@ def func6():
             "context": context,
         },
     ]
+
+    seq_num += 1
+    await hass.services.async_call("pyscript", "service_cleanup", {})
+    assert literal_eval(await wait_until_done(notify_q)) == [seq_num]

tests/test_unit_eval.py

@@ -1372,7 +1372,9 @@ def func(arg):
 
 id = task.create(func, 19)
 done, pending = task.wait({id}, timeout=0)
-[len(done), len(pending), id in pending, task.name2id("func") == id, task.name2id()["func"] == id]
+res = [len(done), len(pending), id in pending, task.name2id("func") == id, task.name2id()["func"] == id]
+task.cancel(id)
+res
 """,
         [0, 1, True, True, True],
     ],
@@ -1404,6 +1406,9 @@ async def test_eval(hass):
 
     for test_data in evalTests:
         await run_one_test(test_data)
+    await Function.waiter_sync()
+    await Function.waiter_stop()
+    await Function.reaper_stop()
 
 
 evalTestsExceptions = [
@@ -1657,3 +1662,6 @@ async def test_eval_exceptions(hass):
 
     for test_data in evalTestsExceptions:
         await run_one_test_exception(test_data)
+    await Function.waiter_sync()
+    await Function.waiter_stop()
+    await Function.reaper_stop()

tests/test_unit_trigger.py

@@ -91,6 +91,9 @@ async def test_parse_date_time(hass, caplog):
             spec, date_offset, expect = test_data
             out = TrigTime.parse_date_time(spec, date_offset, now, now)
             assert out == expect
+    await Function.waiter_sync()
+    await Function.waiter_stop()
+    await Function.reaper_stop()
 
 
 parseDateTimeTestsDayNames = [
@@ -127,6 +130,9 @@ async def test_parse_date_time_day_names(hass, caplog):
             spec, date_offset, expect = test_data
             out = TrigTime.parse_date_time(spec, date_offset, now, now)
             assert out == expect
+    await Function.waiter_sync()
+    await Function.waiter_stop()
+    await Function.reaper_stop()
 
 
 @pytest.mark.parametrize(
@@ -188,7 +194,8 @@ async def test_parse_date_time_day_names(hass, caplog):
     ],
     ids=lambda x: x if not isinstance(x, (dt, list)) else str(x),
 )
-def test_timer_active_check(hass, spec, now, expected):
+@pytest.mark.asyncio
+async def test_timer_active_check(hass, spec, now, expected):
     """Run time active check tests."""
 
     #
@@ -206,6 +213,9 @@ def test_timer_active_check(hass, spec, now, expected):
     print(f"calling timer_active_check({spec}, {now}, {startup_time})")
     out = TrigTime.timer_active_check(spec, now, startup_time)
     assert out == expected
+    await Function.waiter_sync()
+    await Function.waiter_stop()
+    await Function.reaper_stop()
 
 
 timerTriggerNextTests = [
@@ -450,7 +460,8 @@ def test_timer_active_check(hass, spec, now, expected):
 ]
 
 
-def test_timer_trigger_next(hass):
+@pytest.mark.asyncio
+async def test_timer_trigger_next(hass):
     """Run trigger next tests."""
     #
     # Hardcode a location and timezone so we can check sunrise
@@ -474,6 +485,9 @@ def test_timer_trigger_next(hass):
             if t_next is None:
                 break
             now = t_next + timedelta(microseconds=1)
+    await Function.waiter_sync()
+    await Function.waiter_stop()
+    await Function.reaper_stop()
 
 
 timerTriggerNextTestsMonthRollover = [
@@ -571,7 +585,8 @@ def test_timer_trigger_next(hass):
 ]
 
 
-def test_timer_trigger_next_month_rollover(hass):
+@pytest.mark.asyncio
+async def test_timer_trigger_next_month_rollover(hass):
     """Run month rollover tests."""
 
     Function.init(hass)
@@ -584,3 +599,6 @@ def test_timer_trigger_next_month_rollover(hass):
             t_next = TrigTime.timer_trigger_next(spec, now, startup_time)
             assert t_next == expect
             now = t_next
+    await Function.waiter_sync()
+    await Function.waiter_stop()
+    await Function.reaper_stop()