X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestMain.py;h=4241e6a71141af3a5d95584c1a7fed0a5716309b;hb=6538ab6e1bc3d71412f4caf567cd18a11e1267c2;hp=0c84e353fe8a89d4bc29f51430ef02a1621cdde5;hpb=ecd8c71c8aba3484eff887951c0b41c1a8405ec7;p=tests.git

diff --git a/system/TestMain.py b/system/TestMain.py
index 0c84e35..4241e6a 100755
--- a/system/TestMain.py
+++ b/system/TestMain.py
@@ -286,7 +286,7 @@ steps refer to a method in TestPlc or to a step_* module
         if self.options.list_steps:
             self.init_steps()
             self.list_steps()
-            return True
+            return 'SUCCESS'
 
         # steps
         if not self.options.steps:
@@ -299,6 +299,7 @@ steps refer to a method in TestPlc or to a step_* module
         self.options.exclude = [ step.replace('-','_') for step in self.options.exclude ]
         self.options.ignore = [ step.replace('-','_') for step in self.options.ignore ]
 
+        # technicality, decorate known steps to produce the '_ignore' version
         TestPlc.create_ignore_steps()
 
         # exclude
@@ -441,7 +442,7 @@ steps refer to a method in TestPlc or to a step_* module
                                 skip_step=True
                             elif answer in ['q','b']:   # quit/bye
                                 print 'Exiting'
-                                return
+                                return 'FAILURE'
                             elif answer in ['d']:       # dry_run
                                 dry_run=self.options.dry_run
                                 self.options.dry_run=True
@@ -526,7 +527,6 @@ steps refer to a method in TestPlc or to a step_* module
     def main(self):
         try:
             success=self.run()
-            print 'run has returned %s'%success
             if success == 'SUCCESS':    return 0
             elif success == 'IGNORED':  return 2
             else:                       return 1
@@ -539,5 +539,5 @@ steps refer to a method in TestPlc or to a step_* module
 
 if __name__ == "__main__":
     exit_code = TestMain().main()
-    print 'run_log is exiting',exit_code
-    sys.exit(TestMain().main())
+    print "TestMain exit code",exit_code
+    sys.exit(exit_code)