update tests for 2023.7 - no limit arg on service calls

Author: craigbarratt

custom_components/pyscript/function.py

@@ -325,7 +325,6 @@ async def service_call(cls, domain, name, **kwargs):
             ("context", [Context], cls.task2context.get(curr_task, None)),
             ("blocking", [bool], None),
             ("return_response", [bool], None),
-            ("limit", [float, int], None),
         ]:
             if keyword in kwargs and type(kwargs[keyword]) in typ:
                 hass_args[keyword] = kwargs.pop(keyword)
@@ -396,7 +395,6 @@ async def service_call(*args, **kwargs):
                     ("context", [Context], cls.task2context.get(curr_task, None)),
                     ("blocking", [bool], None),
                     ("return_response", [bool], None),
-                    ("limit", [float, int], None),
                 ]:
                     if keyword in kwargs and type(kwargs[keyword]) in typ:
                         hass_args[keyword] = kwargs.pop(keyword)

tests/requirements_test.txt

@@ -6,6 +6,6 @@ mypy==1.3.0
 pre-commit==3.2.1
 pytest==7.3.1
 pytest-cov==3.0.0
-pytest-homeassistant-custom-component==0.13.34
+pytest-homeassistant-custom-component==0.13.45
 pylint==2.17.4
 pylint-strict-informational==0.1

tests/test_function.py

@@ -1216,14 +1216,18 @@ async def test_service_call_params(hass):
     """Test that hass params get set properly on service calls."""
     with patch.object(hass.services, "async_call") as call, patch.object(
         Function, "service_has_service", return_value=True
+    ), patch.object(
+        hass.services,
+        "supports_response",
+        return_value="none",
     ):
         Function.init(hass)
         await Function.service_call(
-            "test", "test", context=Context(id="test"), blocking=True, limit=1, other_service_data="test"
+            "test", "test", context=Context(id="test"), blocking=True, other_service_data="test"
         )
         assert call.called
         assert call.call_args[0] == ("test", "test", {"other_service_data": "test"})
-        assert call.call_args[1] == {"context": Context(id="test"), "blocking": True, "limit": 1}
+        assert call.call_args[1] == {"context": Context(id="test"), "blocking": True}
         call.reset_mock()
 
         await Function.service_call(
@@ -1234,12 +1238,10 @@ async def test_service_call_params(hass):
         assert call.call_args[1] == {"context": Context(id="test"), "blocking": False}
         call.reset_mock()
 
-        await Function.get("test.test")(
-            context=Context(id="test"), blocking=True, limit=1, other_service_data="test"
-        )
+        await Function.get("test.test")(context=Context(id="test"), blocking=True, other_service_data="test")
         assert call.called
         assert call.call_args[0] == ("test", "test", {"other_service_data": "test"})
-        assert call.call_args[1] == {"context": Context(id="test"), "blocking": True, "limit": 1}
+        assert call.call_args[1] == {"context": Context(id="test"), "blocking": True}
         call.reset_mock()
 
         await Function.get("test.test")(
@@ -1285,20 +1287,19 @@ def func_startup():
     pyscript.done = [seq_num, pyscript.var1]
 
     seq_num += 1
-    pyscript.var1 = int(pyscript.var1) + 1
-    service.call("pyscript", "long_sleep", blocking=True, limit=1e-6)
+    service.call("pyscript", "short_sleep", blocking=True)
     pyscript.done = [seq_num, pyscript.var1]
 
-    task.cancel(long_sleep_id)
     seq_num += 1
     pyscript.done = [seq_num]
 
 @service
-def long_sleep():
+def short_sleep():
     global long_sleep_id
 
     long_sleep_id = task.current_task()
-    task.sleep(10000)
+    task.sleep(0.0001)
+    pyscript.var1 = int(pyscript.var1) + 1
 
 @service
 def service1():

tests/test_reload.py

@@ -289,6 +289,8 @@ def shutdown(trigger_time=None):
             )
             if i < 2:
                 await hass.services.async_call("pyscript", "reload", {"global_ctx": "*"}, blocking=True)
+                while caplog.text.count("world is starting up") < 3 + i:
+                    await asyncio.sleep(0.001)
 
         #
         # make sure files that shouldn't load were not loaded