From 93ebbb3814893c3bd9cb7043c2ff4a6730461c5d Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 25 Jun 2010 22:46:11 +0200 Subject: [PATCH] tests that pass should now report so --- system/TestMain.py | 2 -- system/TestPlc.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/system/TestMain.py b/system/TestMain.py index 360f918..55f0516 100755 --- a/system/TestMain.py +++ b/system/TestMain.py @@ -308,7 +308,6 @@ steps refer to a method in TestPlc or to a step_* module # do all steps on all plcs TRACE_FORMAT="TRACE: time=%(time)s status=%(status)s step=%(stepname)s plc=%(plcname)s force=%(force)s\n" for (stepname,method,force) in all_step_infos: - print "Entering step %(stepname)s with overall=%(overall_result)r"%locals() for (spec,obj) in all_plcs: plcname=spec['name'] @@ -375,7 +374,6 @@ steps refer to a method in TestPlc or to a step_* module trace.write(TRACE_FORMAT%locals()) trace.flush() - print "After last step, overall=%(overall_result)r"%locals() if self.options.trace_file and not self.options.dry_run: trace.close() diff --git a/system/TestPlc.py b/system/TestPlc.py index 1236395..8b9e913 100644 --- a/system/TestPlc.py +++ b/system/TestPlc.py @@ -118,7 +118,7 @@ class TestPlc: return single_line.replace(" "+SEP+" "," \\\n").replace(" "+SEPSFA+" "," \\\n") @staticmethod def valid_step (step): - return step != SEP + return step != SEP and step != SEPSFA # turn off the sfa-related steps when build has skipped SFA # this is originally for centos5 as recent SFAs won't build on this platformb -- 2.43.0