fix task.wait_until() trigger_type return when there is a timeout

with other triggers that don't occur first, and added test case

Author: craigbarratt

custom_components/pyscript/trigger.py

@@ -213,6 +213,7 @@ async def wait_until(
                     ret = {"trigger_type": "timeout"}
                     break
                 if this_timeout is None or this_timeout > time_left:
+                    ret = {"trigger_type": "timeout"}
                     this_timeout = time_left
             if this_timeout is None:
                 if state_trigger is None and event_trigger is None:
@@ -233,7 +234,8 @@ async def wait_until(
                         notify_q.get(), timeout=this_timeout
                     )
                 except asyncio.TimeoutError:
-                    ret = {"trigger_type": "time"}
+                    if not ret:
+                        ret = {"trigger_type": "time"}
                     break
             if notify_type == "state":
                 if state_trig_expr is None:

tests/custom_components/pyscript/test_func.py

@@ -201,6 +201,15 @@ def func4(trigger_type=None, event_type=None, **kwargs):
     log.info(f"func4 trigger_type = {res}")
     pyscript.done = [seq_num, res]
 
+    seq_num += 1
+    #
+    # make sure a short timeout works when there is only a state trigger
+    # that isn't true
+    #
+    res = task.wait_until(state_trigger="pyscript.f4var2 == '20'", timeout=1e-6)
+    log.info(f"func4 trigger_type = {res}")
+    pyscript.done = [seq_num, res]
+
     seq_num += 1
     #
     # make sure a short timeout works when there are no other triggers
@@ -351,9 +360,9 @@ def func4(trigger_type=None, event_type=None, **kwargs):
     assert literal_eval(hass.states.get("pyscript.setVar3").state) == {"foo": "bar"}
 
     #
-    # check for the three time triggers, two timeouts and two none
+    # check for the four time triggers, three timeouts and two none
     #
-    for trig_type in ["time"] * 4 + ["timeout"] * 2 + ["none"] * 2:
+    for trig_type in ["time"] * 4 + ["timeout"] * 3 + ["none"] * 2:
         seq_num += 1
         assert literal_eval(await wait_until_done(notify_q)) == [
             seq_num,