X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestMain.py;h=0c84e353fe8a89d4bc29f51430ef02a1621cdde5;hb=ecd8c71c8aba3484eff887951c0b41c1a8405ec7;hp=a325223bd1c1be28b352ad5f8e985278bd86355e;hpb=737175852208c30ed521ed04b0eb6315408d9e4c;p=tests.git diff --git a/system/TestMain.py b/system/TestMain.py index a325223..0c84e35 100755 --- a/system/TestMain.py +++ b/system/TestMain.py @@ -11,7 +11,7 @@ import readline import glob import utils -from TestPlc import TestPlc +from TestPlc import TestPlc, Ignored from TestSite import TestSite from TestNode import TestNode from macros import sequences @@ -127,8 +127,8 @@ class TestMain: try: (step,qualifier)=step.split('@') except: pass stepname=step - for special in ['force']: - stepname = stepname.replace(special+'_',"") + for special in ['force','ignore']: + stepname = stepname.replace('_'+special,"") Step(stepname).print_doc() def run (self): @@ -159,6 +159,8 @@ steps refer to a method in TestPlc or to a step_* module help="fcdistro - as in vbuild-nightly") parser.add_option("-e","--exclude",action="append", dest="exclude", default=[], help="steps to exclude - can be set multiple times, or use quotes") + parser.add_option("-i","--ignore",action="append", dest="ignore", default=[], + help="steps to run but ignore - can be set multiple times, or use quotes") parser.add_option("-a","--all",action="store_true",dest="all_steps", default=False, help="Run all default steps") parser.add_option("-l","--list",action="store_true",dest="list_steps", default=False, @@ -187,7 +189,7 @@ steps refer to a method in TestPlc or to a step_* module help="Used by plc_db_dump and plc_db_restore") parser.add_option("-v","--verbose", action="store_true", dest="verbose", default=False, help="Run in verbose mode") - parser.add_option("-i","--interactive",action="store_true",dest="interactive",default=False, + parser.add_option("-I","--interactive",action="store_true",dest="interactive",default=False, help="prompts before each step") parser.add_option("-n","--dry-run", action="store_true", dest="dry_run", default=False, help="Show environment and exits") @@ -208,7 +210,7 @@ steps refer to a method in TestPlc or to a step_* module result.append(el) return result # flatten relevant options - for optname in ['config','exclude','ips_bplc','ips_vplc','ips_bnode','ips_vnode']: + for optname in ['config','exclude','ignore','ips_bplc','ips_vplc','ips_bnode','ips_vnode']: setattr(self.options,optname, flatten ( [ arg.split() for arg in getattr(self.options,optname) ] )) if not self.options.rspec_styles: @@ -295,6 +297,9 @@ steps refer to a method in TestPlc or to a step_* module # rewrite '-' into '_' in step names self.options.steps = [ step.replace('-','_') for step in self.options.steps ] self.options.exclude = [ step.replace('-','_') for step in self.options.exclude ] + self.options.ignore = [ step.replace('-','_') for step in self.options.ignore ] + + TestPlc.create_ignore_steps() # exclude selected=[] @@ -305,6 +310,11 @@ steps refer to a method in TestPlc or to a step_* module keep=False break if keep: selected.append(step) + + # ignore + selected = [ step if step not in self.options.ignore else step+"_ignore" + for step in selected ] + self.options.steps=selected # this is useful when propagating on host boxes, to avoid conflicts @@ -362,15 +372,15 @@ steps refer to a method in TestPlc or to a step_* module # pass options to utils as well utils.init_options(self.options) - overall_result = True + overall_result = 'SUCCESS' all_step_infos=[] for step in self.options.steps: if not TestPlc.valid_step(step): continue # some steps need to be done regardless of the previous ones: we force them force=False - if step.find("force_") == 0: - step=step.replace("force_","") + if step.endswith("_force"): + step=step.replace("_force","") force=True # allow for steps to specify an index like in # run checkslice@2 @@ -389,7 +399,7 @@ steps refer to a method in TestPlc or to a step_* module except : utils.header("********** FAILED step %s (NOT FOUND) -- won't be run"%step) traceback.print_exc() - overall_result = False + overall_result = 'FAILURE' if self.options.dry_run: self.show_env(self.options,"Dry run") @@ -457,17 +467,28 @@ steps refer to a method in TestPlc or to a step_* module utils.header("********** %d RUNNING step %s%s on plc %s"%(plc_counter,stepname,force_msg,plcname)) if not cross: step_result = method(plc_obj) else: step_result = method(plc_obj,across_plcs) - if step_result: + if isinstance (step_result,Ignored): + step_result=step_result.result + if step_result: + msg="OK" + else: + msg="KO" + # 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: utils.header('********** %d SUCCESSFUL step %s on %s'%(plc_counter,stepname,plcname)) status="OK" else: - overall_result = False + overall_result = 'FAILURE' spec['failed_step'] = stepname utils.header('********** %d FAILED Step %s on %s (discarded from further steps)'\ %(plc_counter,stepname,plcname)) status="KO" except: - overall_result=False + overall_result='FAILURE' spec['failed_step'] = stepname traceback.print_exc() utils.header ('********** %d FAILED (exception) Step %s on %s (discarded from further steps)'\ @@ -497,19 +518,26 @@ steps refer to a method in TestPlc or to a step_* module return overall_result # wrapper to run, returns a shell-compatible result + # retcod: + # 0: SUCCESS + # 1: FAILURE + # 2: SUCCESS but some ignored steps failed + # 3: OTHER ERROR def main(self): try: success=self.run() - if success: - return 0 - else: - return 1 + print 'run has returned %s'%success + if success == 'SUCCESS': return 0 + elif success == 'IGNORED': return 2 + else: return 1 except SystemExit: print 'Caught SystemExit' - raise + return 3 except: traceback.print_exc() - return 2 + return 3 if __name__ == "__main__": + exit_code = TestMain().main() + print 'run_log is exiting',exit_code sys.exit(TestMain().main())