X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FCompleter.py;h=337e4d945e6ade190e11071a6c89e3fc0020a24e;hb=5148b9f217612f5044034a3f2efd7a69a9a25529;hp=d24af019623edfe9ad3ad3f45988c9ece4aa1d44;hpb=c8e2f4e3a327181b29521583770a6f0ff68ca6eb;p=tests.git

diff --git a/system/Completer.py b/system/Completer.py
index d24af01..337e4d9 100755
--- a/system/Completer.py
+++ b/system/Completer.py
@@ -1,4 +1,8 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+# -*- python3 -*-
+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2015 INRIA 
+
 import sys, time
 from datetime import datetime, timedelta
 
@@ -45,15 +49,15 @@ class Completer:
             if not tasks:
                 if self.verbose:
                     duration = datetime.now() - begin
-                    print "total completer {} {}s".format(self.message,
-                                                          int(duration.total_seconds()))
+                    print("total completer {} {}s".format(self.message,
+                                                          int(duration.total_seconds())))
                 return True
             if datetime.now() > timeout:
                 for task in tasks: 
                     task.failure_epilogue()
                 return False
             if self.verbose:
-                print '{}s..'.format(period_seconds),
+                print('{}s..'.format(period_seconds), end=' ')
             time.sleep(period_seconds)
         # in case we're empty 
         return True
@@ -76,17 +80,17 @@ class CompleterTask:
     def run (self, silent):
         result = self.actual_run()
         if silent:
-            print '+' if result else '.',
+            print('+' if result else '.', end=' ')
             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_epilogue (self):
-        print "you-need-to-redefine-failure_epilogue"
+        print("you-need-to-redefine-failure_epilogue")
 
 # random result
 class TaskTest (CompleterTask):
@@ -103,19 +107,19 @@ class TaskTest (CompleterTask):
         return "Task {} - delay was {}s".format(self.counter, self.delay)
 
     def failure_epilogue (self):
-        print "BOTTOM LINE: FAILURE with task ({})".format(self.counter)
+        print("BOTTOM LINE: FAILURE with task ({})".format(self.counter))
 
 def main ():
     import sys
     if len(sys.argv) != 6:
-        print "Usage: <command> number_tasks max_random timeout_s silent_s period_s"
+        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:]]
     tasks = [ TaskTest(max) for i in range(number)]
     success = Completer(tasks,verbose=True).run(timedelta(seconds=timeout),
                                                 timedelta(seconds=silent),
                                                 timedelta(seconds=period))
-    print "OVERALL",success
+    print("OVERALL",success)
 
 if __name__ == '__main__':
     main()