fixed broken test

Author: craigbarratt

custom_components/pyscript/trigger.py

@@ -906,17 +906,14 @@ async def trigger_watch(self):
             state_trig_waiting = False
             state_trig_notify_info = [None, None]
             state_false_time = None
-            startup_time = None
+            now = startup_time = None
             check_state_expr_on_start = self.state_check_now or self.state_hold_false is not None
 
             while True:
                 timeout = None
                 state_trig_timeout = False
                 notify_info = None
                 notify_type = None
-                now = dt_now()
-                if startup_time is None:
-                    startup_time = now
                 if self.run_on_startup:
                     #
                     # first time only - skip waiting for other triggers
@@ -937,6 +934,9 @@ async def trigger_watch(self):
                     check_state_expr_on_start = False
                 else:
                     if self.time_trigger:
+                        now = dt_now()
+                        if startup_time is None:
+                            startup_time = now
                         time_next = TrigTime.timer_trigger_next(self.time_trigger, now, startup_time)
                         _LOGGER.debug(
                             "trigger %s time_next = %s, now = %s", self.name, time_next, now,
@@ -1081,6 +1081,10 @@ async def trigger_watch(self):
                         self.active_expr.get_logger().error(exc)
                         trig_ok = False
                 if trig_ok and self.time_active:
+                    if now is None:
+                        now = dt_now()
+                        if startup_time is None:
+                            startup_time = now
                     trig_ok = TrigTime.timer_active_check(self.time_active, now, startup_time)
 
                 if not trig_ok:

tests/test_function.py

@@ -191,11 +191,7 @@ async def test_state_trigger(hass, caplog):
         hass,
         notify_q,
         notify_q2,
-        [
-            dt(2020, 7, 1, 10, 59, 59, 999998),
-            dt(2020, 7, 1, 10, 59, 59, 999998),
-            dt(2020, 7, 1, 11, 59, 59, 999998),
-        ],
+        [dt(2020, 7, 1, 10, 59, 59, 999998), dt(2020, 7, 1, 11, 59, 59, 999998)],
         """
 
 from math import sqrt
@@ -206,12 +202,13 @@ async def test_state_trigger(hass, caplog):
 #
 # Instead of just a bare @time_trigger, do a real time trigger.
 # The first value of now() causes func_startup_sync() to start almost
-# immediately.  The remaining values of now() are all and hour later at
+# immediately.  The remaining values of now() are all an hour later at
 # 11:59:59.999998, so this trigger won't happen again for another 24 hours.
 # (we don't use 11:59:59.999999 because of a bug in croniter.match();
 # see https://github.com/taichino/croniter/issues/151)
 #
 @time_trigger("once(2020/07/01 11:00:00)")
+#@time_trigger("startup")
 def func_startup_sync(trigger_type=None, trigger_time=None):
     global seq_num