added more tests

Author: craigbarratt

custom_components/pyscript/eval.py

@@ -1381,11 +1381,7 @@ def completions(self, root):
                 try:
                     for attr in var.__dir__():
                         if attr.lower().startswith(attr_root) and (attr_root != "" or attr[0:1] != "_"):
-                            value = getattr(var, attr, None)
-                            if callable(value) or isinstance(value, EvalFunc):
-                                words.add(f"{name}.{attr}")
-                            else:
-                                words.add(f"{name}.{attr}")
+                            words.add(f"{name}.{attr}")
                 except Exception:
                     pass
         for keyw in set(keyword.kwlist) - {"yield"}:
@@ -1398,11 +1394,7 @@ def completions(self, root):
         sym_table.update(self.global_sym_table.items())
         for name, value in sym_table.items():
             if name.lower().startswith(root):
-                if callable(value) or isinstance(value, EvalFunc):
-                    # used to be f"{name}(", but Jupyter doesn't always do the right thing with that
-                    words.add(name)
-                else:
-                    words.add(name)
+                words.add(name)
         return words
 
     async def eval(self, new_state_vars=None):

custom_components/pyscript/jupyter_kernel.py

@@ -321,8 +321,6 @@ def encode(msg):
             # _LOGGER.debug("send %s: %s", msg_type, parts)
             for this_stream in stream if isinstance(stream, set) else {stream}:
                 await this_stream.send_multipart(parts)
-        # else:
-        #     _LOGGER.debug("send skipping msg_type %s since socket is None", msg_type)
 
     async def shell_handler(self, shell_socket, wire_msg):
         """Handle shell messages."""

custom_components/pyscript/trigger.py

@@ -26,21 +26,6 @@ def dt_now():
     return dt.datetime.now()
 
 
-def isleap(year):
-    """Return True or False if year is a leap year."""
-    return (year % 4) == 0 and (year % 100) != 0 or (year % 400) == 0
-
-
-def days_in_mon(month, year):
-    """Return numbers of days in month month of year year, 1 <= month <= 12."""
-    dom = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
-
-    month -= 1
-    if (month == 1) and isleap(year):
-        return dom[month] + 1
-    return dom[month]
-
-
 def parse_time_offset(offset_str):
     """Parse a time offset."""
     match = re.split(r"([-+]?\s*\d*\.?\d+(?:[eE][-+]?\d+)?)\s*(\w*)", offset_str)

tests/test_function.py

@@ -315,6 +315,13 @@ def func4(trigger_type=None, event_type=None, **kwargs):
     #
     no_such_function("xyz")
 
+@state_trigger("True or pyscript.f5var1")
+def func5(var_name=None, value=None):
+    global seq_num
+
+    seq_num += 1
+    log.info(f"func5 var = {var_name}, value = {value}")
+    pyscript.done = [seq_num, var_name, value]
 """,
     )
     seq_num = 0
@@ -457,3 +464,14 @@ def func4(trigger_type=None, event_type=None, **kwargs):
             ]
 
     assert "name 'no_such_function' is not defined" in caplog.text
+
+    #
+    # test deleting a state variable; func5() triggers on any change to pyscript.f5var1
+    #
+    seq_num += 1
+    hass.states.async_set("pyscript.f5var1", 0)
+    assert literal_eval(await wait_until_done(notify_q)) == [seq_num, "pyscript.f5var1", "0"]
+
+    seq_num += 1
+    hass.states.async_remove("pyscript.f5var1")
+    assert literal_eval(await wait_until_done(notify_q)) == [seq_num, "pyscript.f5var1", None]

tests/test_init.py

@@ -143,6 +143,54 @@ def func7():
     )
 
 
+async def test_syntax_error(hass, caplog):
+    """Test syntax error in pyscript file."""
+
+    await setup_script(
+        hass,
+        None,
+        dt(2020, 7, 1, 11, 59, 59, 999999),
+        """
+@service
+def func1()
+    pass
+""",
+    )
+    assert "SyntaxError: invalid syntax (hello.py, line 3)" in caplog.text
+
+
+async def test_syntax_error2(hass, caplog):
+    """Test syntax error in pyscript file."""
+
+    await setup_script(
+        hass,
+        None,
+        dt(2020, 7, 1, 11, 59, 59, 999999),
+        """
+xyz def 123
+""",
+    )
+    assert "SyntaxError: invalid syntax (hello.py, line 2)" in caplog.text
+
+
+async def test_runtime_error(hass, caplog):
+    """Test run-time error in pyscript file."""
+
+    await setup_script(
+        hass,
+        None,
+        dt(2020, 7, 1, 11, 59, 59, 999999),
+        """
+@service
+def func1():
+    pass
+
+xyz
+""",
+    )
+    assert "NameError: name 'xyz' is not defined" in caplog.text
+
+
 async def test_service_description(hass):
     """Test service description defined in doc_string."""
 

tests/test_jupyter.py

@@ -15,6 +15,7 @@
 from pytest_homeassistant.async_mock import mock_open, patch
 
 from homeassistant import loader
+from homeassistant.const import EVENT_HOMEASSISTANT_STARTED, EVENT_HOMEASSISTANT_STOP
 from homeassistant.setup import async_setup_component
 
 SECRET_KEY = b"0123456789abcdef"
@@ -232,9 +233,10 @@ async def shell_msg(sock, msg_type, msg_content, execute=False):
 
 
 async def test_jupyter_kernel_msgs(hass, caplog):
-    """Test Jupyter kernel."""
+    """Test Jupyter kernel messages."""
     sock, _ = await setup_script(hass, [dt(2020, 7, 1, 11, 0, 0, 0)], "")
 
+    hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
     #
     # test the heartbeat loopback with some long and short messages
     # also send messages to stdin and iopub, which ignore them
@@ -264,11 +266,13 @@ async def test_jupyter_kernel_msgs(hass, caplog):
     #
     # test completions
     #
-    reply = await shell_msg(sock, "complete_request", {"code": "whi", "cursor_pos": 3})
+    code = "whi"
+    reply = await shell_msg(sock, "complete_request", {"code": code, "cursor_pos": len(code)})
     assert reply["header"]["msg_type"] == "complete_reply"
     assert reply["content"]["matches"] == ["while"]
 
-    reply = await shell_msg(sock, "complete_request", {"code": "pyscr", "cursor_pos": 5})
+    code = "pyscr"
+    reply = await shell_msg(sock, "complete_request", {"code": code, "cursor_pos": len(code)})
     assert reply["header"]["msg_type"] == "complete_reply"
     assert reply["content"]["matches"] == [
         "pyscript",
@@ -313,36 +317,47 @@ async def test_jupyter_kernel_msgs(hass, caplog):
     #
     # test code execution
     #
-    reply = await shell_msg(sock, "execute_request", {"code": "1 + 2"}, execute=True)
-    assert reply["content"]["data"]["text/plain"] == "3"
+    reply = await shell_msg(sock, "execute_request", {"code": "x = 123; x + 1 + 2"}, execute=True)
+    assert reply["content"]["data"]["text/plain"] == "126"
+
+    reply = await shell_msg(sock, "execute_request", {"code": "import math; x + 5"}, execute=True)
+    assert reply["content"]["data"]["text/plain"] == "128"
+
+    #
+    # do a reload to make sure our global context is preserved
+    #
+    await hass.services.async_call("pyscript", "reload", {}, blocking=True)
+
+    reply = await shell_msg(sock, "execute_request", {"code": "x + 10"}, execute=True)
+    assert reply["content"]["data"]["text/plain"] == "133"
+
+    #
+    # test completion of object attribute now that we've loaded math above
+    #
+    code = "import math; math.sq"
+    reply = await shell_msg(sock, "complete_request", {"code": code, "cursor_pos": len(code)})
+    assert reply["header"]["msg_type"] == "complete_reply"
+    assert reply["content"]["matches"] == ["math.sqrt"]
 
     #
     # run-time error
     #
-    reply = await shell_msg(sock, "execute_request", {"code": "x"}, execute=True)
-    assert reply["content"]["evalue"] == "name 'x' is not defined"
+    reply = await shell_msg(sock, "execute_request", {"code": "xyz"}, execute=True)
+    assert reply["content"]["evalue"] == "name 'xyz' is not defined"
 
     #
     # syntax error
     #
     reply = await shell_msg(sock, "execute_request", {"code": "1 + "}, execute=True)
     assert reply["content"]["evalue"] == "invalid syntax (jupyter_0, line 1)"
 
-    #
-    # test stdout; doesn't work yet since iopub messages can be OoO
-    # doesn't work yet...
-    #
-    reply = await shell_msg(sock, "execute_request", {"code": "print('hello'); 123"}, execute=True)
-    assert reply["header"]["msg_type"] == "execute_result"
-    assert reply["content"]["data"]["text/plain"] == "123"
-    #    stdout_msg = await get_iopub_msg(sock, "stream")
-    #    assert reply["content"]["text"] == "hello"
+    hass.bus.async_fire(EVENT_HOMEASSISTANT_STOP)
 
     await shutdown(sock)
 
 
 async def test_jupyter_kernel_port_close(hass, caplog):
-    """Test Jupyter kernel."""
+    """Test Jupyter kernel closing ports."""
     sock, port_nums = await setup_script(hass, [dt(2020, 7, 1, 11, 0, 0, 0)], "")
 
     #
@@ -382,11 +397,12 @@ async def test_jupyter_kernel_port_close(hass, caplog):
         await sock["stdin_port"].send(msg)
         assert await sock["hb_port"].recv() == msg
 
+    hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
     await shutdown(sock)
 
 
 async def test_jupyter_kernel_redefine_func(hass, caplog):
-    """Test Jupyter kernel."""
+    """Test Jupyter kernel redefining trigger function."""
     sock, _ = await setup_script(hass, [dt(2020, 7, 1, 11, 0, 0, 0)], "")
 
     reply = await shell_msg(
@@ -427,7 +443,7 @@ def func():
 
 
 async def test_jupyter_kernel_global_ctx_func(hass, caplog):
-    """Test Jupyter kernel."""
+    """Test Jupyter kernel global_ctx functions."""
     sock, _ = await setup_script(hass, [dt(2020, 7, 1, 11, 0, 0, 0)], "")
 
     reply = await shell_msg(sock, "execute_request", {"code": "pyscript.get_global_ctx()"}, execute=True)
@@ -445,3 +461,16 @@ async def test_jupyter_kernel_global_ctx_func(hass, caplog):
     assert literal_eval(reply["content"]["data"]["text/plain"]) == 456
 
     await shutdown(sock)
+
+
+async def test_jupyter_kernel_stdout(hass, caplog):
+    """Test Jupyter kernel stdout."""
+    sock, _ = await setup_script(hass, [dt(2020, 7, 1, 11, 0, 0, 0)], "")
+
+    reply = await shell_msg(sock, "execute_request", {"code": "log.info('hello'); 123"}, execute=True)
+    assert reply["header"]["msg_type"] == "execute_result"
+    assert reply["content"]["data"]["text/plain"] == "123"
+    stdout_msg = await get_iopub_msg(sock, "stream")
+    assert stdout_msg["content"]["text"] == "hello\n"
+
+    await shutdown(sock)