From bd4c2211412580f55fccf66d5ad2d680fab36bb4 Mon Sep 17 00:00:00 2001 From: Ramiro Polla Date: Fri, 16 Jan 2015 19:00:25 +0100 Subject: [PATCH] validate: launcher: Initialize Test start time outside of wait_process wait_process will be moved to TestManager, so the values used to track process update must remain inside Test. Patch 2/4 to make TestManager handle waiting for processes instead of expecting each Test to do it. --- validate/launcher/baseclasses.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/validate/launcher/baseclasses.py b/validate/launcher/baseclasses.py index 69af9f5..393e401 100644 --- a/validate/launcher/baseclasses.py +++ b/validate/launcher/baseclasses.py @@ -192,9 +192,6 @@ class Test(Loggable): return Result.NOT_RUN def wait_process(self): - self.last_val = 0 - self.last_change_ts = time.time() - self.start_ts = time.time() while True: # Check process every second for timeout self.thread.join(1.0) @@ -305,6 +302,10 @@ class Test(Loggable): self.thread = threading.Thread(target=self.thread_wrapper) self.thread.start() + self.last_val = 0 + self.last_change_ts = time.time() + self.start_ts = time.time() + try: self.wait_process() except KeyboardInterrupt: -- 2.7.4