X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FCompleter.py;h=d24af019623edfe9ad3ad3f45988c9ece4aa1d44;hb=c8e2f4e3a327181b29521583770a6f0ff68ca6eb;hp=0ebf6e60cc8a6810ac952e855c4aa21b833139d3;hpb=8187af97b4b8d3c4134bf46905ccecc627b91daa;p=tests.git

diff --git a/system/Completer.py b/system/Completer.py
index 0ebf6e6..d24af01 100755
--- a/system/Completer.py
+++ b/system/Completer.py
@@ -9,32 +9,51 @@ import utils
 ### takes in argument a list of tasks that are instances 
 ### of a CompleterTask subclass
 class Completer:
-    def __init__ (self, tasks, verbose=True):
-        self.tasks=tasks
-        self.verbose=verbose
-    def run (self, timeout_timedelta, silent_timedelta, period=None):
-        timeout = datetime.now()+timeout_timedelta
-        timeout_minutes = timeout_timedelta.total_seconds()/60
+    def __init__ (self, tasks, verbose=True, message=None):
+        self.tasks = tasks
+        self.verbose = verbose
+        self.message = "({})".format(message) if message else ""
+    def run (self, timeout_timedelta, silent_timedelta, period):
+        begin = datetime.now()
+        timeout = begin+timeout_timedelta
+        timeout_seconds = timeout_timedelta.total_seconds()
+        timeout_minutes = timeout_seconds/60
         graceout = datetime.now()+silent_timedelta
-        silent_minutes = silent_timedelta.total_seconds()/60
-        period_seconds=int(period.total_seconds())
+        silent_seconds = silent_timedelta.total_seconds()
+        silent_minutes = silent_seconds/60
+        period_seconds = int(period.total_seconds())
         if self.verbose:
-            utils.header("max timeout is %d minutes, silent for %d minutes (period is %s s)"%\
-                             (timeout_minutes,silent_minutes,period_seconds))
-        tasks=self.tasks
+            if timeout_seconds >= 120:
+                utils.header("Completer [{} tasks]: max timeout is {} minutes, "
+                             "silent for {} minutes (period is {} s)"\
+                             .format(len(self.tasks), timeout_minutes,
+                                     silent_minutes, period_seconds))
+            else:
+                utils.header("Completer [{} tasks]: max timeout is {} seconds, "
+                             "silent for {} seconds (period is {} s)"\
+                             .format(len(self.tasks), timeout_seconds,
+                                     silent_seconds, period_seconds))
+        tasks = self.tasks
         while tasks:
-            fine=[]
+            fine = []
             for task in tasks:
-                success=task.run (silent=datetime.now() <= graceout)
-                if success: fine.append(task)
-            for task in fine: tasks.remove(task)
-            if not tasks: return True
+                success = task.run (silent=datetime.now() <= graceout)
+                if success:
+                    fine.append(task)
+            for task in fine:
+                tasks.remove(task)
+            if not tasks:
+                if self.verbose:
+                    duration = datetime.now() - begin
+                    print "total completer {} {}s".format(self.message,
+                                                          int(duration.total_seconds()))
+                return True
             if datetime.now() > timeout:
                 for task in tasks: 
-                    print task.failure_message()
+                    task.failure_epilogue()
                 return False
             if self.verbose:
-                print '%ds..'%period_seconds,
+                print '{}s..'.format(period_seconds),
             time.sleep(period_seconds)
         # in case we're empty 
         return True
@@ -55,42 +74,47 @@ class Completer:
 
 class CompleterTask:
     def run (self, silent):
-        result=self.actual_run()
+        result = self.actual_run()
         if silent:
             print '+' if result else '.',
             sys.stdout.flush()
         else:
-            print self.message(),"->","OK" if result else "KO"
+            print self.message(), "->", "OK" if result else "KO"
         return result
-    def message (self): return "you-need-to-redefine-message"
-    def failure_message (self): return "you-need-to-redefine-failure_message"
+
+    def message (self):
+        return "you-need-to-redefine-message"
+
+    def failure_epilogue (self):
+        print "you-need-to-redefine-failure_epilogue"
 
 # random result
 class TaskTest (CompleterTask):
-    counter=1
+    counter = 1
     def __init__ (self,max):
         import random
-        self.counter=TaskTest.counter
-        TaskTest.counter+=1
-        self.delay=random.random()*max
-        self.fire=datetime.now()+timedelta(seconds=self.delay)
+        self.counter = TaskTest.counter
+        TaskTest.counter += 1
+        self.delay = random.random()*max
+        self.fire = datetime.now() + timedelta(seconds=self.delay)
     def actual_run(self):
-        return datetime.now()>=self.fire
+        return datetime.now() >= self.fire
     def message (self):
-        return "Task %d - delay was %d s"%(self.counter,self.delay)
+        return "Task {} - delay was {}s".format(self.counter, self.delay)
 
-    def failure_message (self): return "BOTTOM LINE: FAILURE with task (%s)"%self.counter
+    def failure_epilogue (self):
+        print "BOTTOM LINE: FAILURE with task ({})".format(self.counter)
 
 def main ():
     import sys
-    if len(sys.argv)!=6:
+    if len(sys.argv) != 6:
         print "Usage: <command> number_tasks max_random timeout_s silent_s period_s"
         sys.exit(1)
-    [number,max,timeout,silent,period]= [ int(x) for x in sys.argv[1:]]
+    [number, max, timeout, silent, period] = [ int(x) for x in sys.argv[1:]]
     tasks = [ TaskTest(max) for i in range(number)]
-    success=Completer(tasks,verbose=True).run(timedelta(seconds=timeout),
-                                              timedelta(seconds=silent),
-                                              timedelta(seconds=period))
+    success = Completer(tasks,verbose=True).run(timedelta(seconds=timeout),
+                                                timedelta(seconds=silent),
+                                                timedelta(seconds=period))
     print "OVERALL",success
 
 if __name__ == '__main__':