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

diff --git a/system/TestMain.py b/system/TestMain.py
index bf5096e..0c84e35 100755
--- a/system/TestMain.py
+++ b/system/TestMain.py
@@ -473,7 +473,9 @@ steps refer to a method in TestPlc or to a step_* module
                                 msg="OK"
                             else:
                                 msg="KO"
-                                overall_result='IGNORED'
+                                # do not overwrite if FAILURE
+                                if overall_result=='SUCCESS': 
+                                    overall_result='IGNORED'
                             utils.header('********** %d IGNORED (%s) step %s on %s'%(plc_counter,msg,stepname,plcname))
                             status="%s[I]"%msg
                         elif step_result:
@@ -518,15 +520,16 @@ steps refer to a method in TestPlc or to a step_* module
     # wrapper to run, returns a shell-compatible result
     # retcod:
     # 0: SUCCESS
-    # 1: SUCCESS but some ignored steps failed
-    # 2: FAILED STEP
+    # 1: FAILURE
+    # 2: SUCCESS but some ignored steps failed
     # 3: OTHER ERROR
     def main(self):
         try:
             success=self.run()
+            print 'run has returned %s'%success
             if success == 'SUCCESS':    return 0
-            elif success == 'IGNORED':  return 1
-            else:                       return 2
+            elif success == 'IGNORED':  return 2
+            else:                       return 1
         except SystemExit:
             print 'Caught SystemExit'
             return 3