X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestMain.py;h=1bf482d41c5ffd6fbd988bb47b7f6e3ed3881589;hb=ae3850f83f338b0545a24b73d856743f7f1d09cb;hp=274815014714eeb1d0a79a1031afb6d2a4146a47;hpb=e97b7749b815fb060b57c8b1a7b096b2ee63499b;p=tests.git diff --git a/system/TestMain.py b/system/TestMain.py index 2748150..1bf482d 100755 --- a/system/TestMain.py +++ b/system/TestMain.py @@ -10,37 +10,40 @@ from TestPlc import TestPlc from TestSite import TestSite from TestNode import TestNode +SEP='' + class TestMain: subversion_id = "$Id$" - default_config = [ 'onelab' ] - - default_steps = ['uninstall','install','install_rpm', - 'configure', 'start', - 'clear_ssh_config','store_keys', 'initscripts', - 'sites', 'nodes', 'slices', - 'bootcd', 'nodegroups', - 'kill_all_qemus', 'start_nodes', - 'standby_4', 'nodes_booted', - 'standby_6','nodes_ssh', 'check_slices', - 'check_tcp', - 'kill_qemus', ] - other_steps = [ 'fresh_install', 'stop', - 'clean_sites', 'clean_nodes', 'clean_slices', 'clean_keys', - 'list_all_qemus', 'kill_qemus', 'stop_nodes' , + default_config = [ 'main' , '1vnodes' , '1testbox64' ] + + default_steps = ['uninstall','install','install_rpm', + 'configure', 'start', SEP, + 'store_keys', 'initscripts', + 'sites', 'nodes', 'slices', 'nodegroups', SEP, + 'init_node','bootcd', 'configure_qemu', SEP, + 'kill_all_qemus', 'start_nodes', SEP, + 'standby_20', SEP, + 'nodes_booted', 'nodes_ssh', 'check_slices', + 'check_initscripts', 'check_tcp',SEP, + 'force_gather_logs', 'force_kill_qemus', ] + other_steps = [ 'stop_all_vservers','fresh_install', 'cache_rpm', 'stop', SEP, + 'clean_sites', 'clean_nodes', 'clean_slices', 'clean_keys', SEP, + 'show_boxes', 'list_all_qemus', 'list_qemus', SEP, 'db_dump' , 'db_restore', - 'standby_1 through 20', + 'standby_1 through 20' ] default_build_url = "http://svn.planet-lab.org/svn/build/trunk" def __init__ (self): - self.path=os.path.dirname(sys.argv[0]) + self.path=os.path.dirname(sys.argv[0]) or "." + os.chdir(self.path) @staticmethod def show_env (options, message): utils.header (message) - utils.show_spec("main options",options) + utils.show_options("main options",options) @staticmethod def optparse_list (option, opt, value, parser): @@ -49,9 +52,13 @@ class TestMain: except: setattr(parser.values,option.dest,value.split()) + @staticmethod + def printable_steps (list): + return " ".join(list).replace(" "+SEP+" ","\n") + def run (self): - steps_message="Defaut steps are\n\t%s"%(" ".join(TestMain.default_steps)) - steps_message += "\nOther useful steps are\n\t %s"%(" ".join(TestMain.other_steps)) + steps_message=20*'x'+" Defaut steps are\n"+TestMain.printable_steps(TestMain.default_steps) + steps_message += "\n"+20*'x'+" Other useful steps are\n"+TestMain.printable_steps(TestMain.other_steps) usage = """usage: %%prog [options] steps myplc-url defaults to the last value used, as stored in arg-myplc-url, no default @@ -73,25 +80,34 @@ steps refer to a method in TestPlc or to a step_* module parser.add_option("-c","--config",action="callback", callback=TestMain.optparse_list, dest="config", nargs=1,type="string", help="Config module - can be set multiple times, or use quotes") + parser.add_option("-x","--exclude",action="callback", callback=TestMain.optparse_list, dest="exclude", + nargs=1,type="string",default=[], + help="steps to exclude - 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, help="List known steps") - parser.add_option("-s","--state",action="store",dest="dbname",default=None, - help="Used by db_dump and db_restore") - parser.add_option("-d","--display", action="store", dest="display", default='bellami.inria.fr:0.0', - help="Set DISPLAY for vmplayer") parser.add_option("-i","--ip",action="callback", callback=TestMain.optparse_list, dest="ips", nargs=1,type="string", help="Specify the set of IP addresses to use in vserver mode (disable scanning)") + parser.add_option("-s","--small",action="store_true",dest="small_test",default=False, + help="run a small test -- typically only one node") + parser.add_option("-d","--dbname",action="store",dest="dbname",default=None, + help="Used by db_dump and db_restore") parser.add_option("-v","--verbose", action="store_true", dest="verbose", default=False, help="Run in verbose mode") + parser.add_option("-q","--quiet", action="store_true", dest="quiet", default=False, + help="Run in quiet mode") parser.add_option("-n","--dry-run", action="store_true", dest="dry_run", default=False, help="Show environment and exits") parser.add_option("-f","--forcenm", action="store_true", dest="forcenm", default=False, help="Force the NM to restart in check_slices step") (self.options, self.args) = parser.parse_args() + # tmp : force small test + utils.header("XXX WARNING : forcing small tests") + self.options.small_test = True + if len(self.args) == 0: if self.options.all_steps: self.options.steps=TestMain.default_steps @@ -108,12 +124,14 @@ steps refer to a method in TestPlc or to a step_* module self.options.steps = self.args # handle defaults and option persistence - for (recname,filename,default) in ( ('myplc_url','arg-myplc-url',"") , - ('build_url','arg-build-url',TestMain.default_build_url) , - ('ips','arg-ips',[]) , - ('config','arg-config',TestMain.default_config) , ) : - print 'handling',recname - path="%s/%s"%(self.path,filename) + for (recname,filename,default) in ( + ('build_url','arg-build-url',TestMain.default_build_url) , + ('ips','arg-ips',[]) , + ('config','arg-config',TestMain.default_config) , + ('myplc_url','arg-myplc-url',"") , + ) : +# print 'handling',recname + path=filename is_list = isinstance(default,list) if not getattr(self.options,recname): try: @@ -133,7 +151,8 @@ steps refer to a method in TestPlc or to a step_* module print "Cannot determine",recname print "Run %s --help for help"%sys.argv[0] sys.exit(1) - utils.header('* Using %s = %s'%(recname,getattr(self.options,recname))) + if not self.options.quiet: + utils.header('* Using %s = %s'%(recname,getattr(self.options,recname))) # save for next run fsave=open(path,"w") @@ -143,7 +162,7 @@ steps refer to a method in TestPlc or to a step_* module for value in getattr(self.options,recname): fsave.write(value + "\n") fsave.close() - utils.header('Saved %s into %s'%(recname,filename)) +# utils.header('Saved %s into %s'%(recname,filename)) # steps if not self.options.steps: @@ -151,8 +170,17 @@ steps refer to a method in TestPlc or to a step_* module #self.options.steps=['dump','clean','install','populate'] self.options.steps=TestMain.default_steps - # store self.path in options.path for the various callbacks - self.options.path = self.path + # exclude + selected=[] + for step in self.options.steps: + keep=True + for exclude in self.options.exclude: + if utils.match(step,exclude): + keep=False + break + if keep: selected.append(step) + self.options.steps=selected + # this is useful when propagating on host boxes, to avoid conflicts self.options.buildname = os.path.basename (os.path.abspath (self.path)) @@ -171,22 +199,30 @@ steps refer to a method in TestPlc or to a step_* module print 'Cannot load config %s -- ignored'%modulename raise # show config - utils.show_spec("Test specifications",all_plc_specs) - # build a TestPlc object from the result + if not self.options.quiet: + utils.show_test_spec("Test specifications",all_plc_specs) + # build a TestPlc object from the result, passing options for spec in all_plc_specs: spec['disabled'] = False - all_plcs = [ (x, TestPlc(x)) for x in all_plc_specs] - # expose to the various objects - for (spec,obj) in all_plcs: - obj.options=self.options + all_plcs = [ (x, TestPlc(x,self.options)) for x in all_plc_specs] + + # pass options to utils as well + utils.init_options(self.options) overall_result = True testplc_method_dict = __import__("TestPlc").__dict__['TestPlc'].__dict__ all_step_infos=[] for step in self.options.steps: + if step == SEP: + continue + force=False + # is it a forcedstep + if step.find("force_") == 0: + step=step.replace("force_","") + force=True # try and locate a method in TestPlc if testplc_method_dict.has_key(step): - all_step_infos += [ (step, testplc_method_dict[step] )] + all_step_infos += [ (step, testplc_method_dict[step] , force)] # otherwise search for the 'run' method in the step_ module else: modulename='step_'+step @@ -197,7 +233,7 @@ steps refer to a method in TestPlc or to a step_* module if not names: raise Exception,"No run* method in module %s"%modulename names.sort() - all_step_infos += [ ("%s.%s"%(step,name),module_dict[name]) for name in names ] + all_step_infos += [ ("%s.%s"%(step,name),module_dict[name],force) for name in names ] except : print 'Step %s -- ignored'%(step) traceback.print_exc() @@ -205,29 +241,35 @@ steps refer to a method in TestPlc or to a step_* module if self.options.dry_run: self.show_env(self.options,"Dry run") - return 0 # do all steps on all plcs - for (stepname,method) in all_step_infos: + for (stepname,method,force) in all_step_infos: for (spec,obj) in all_plcs: plcname=spec['name'] - if spec['disabled']: - utils.header("Plc %s is disabled - skipping step %s"%(plcname,stepname)) - else: + + # run the step + if not spec['disabled'] or force: try: - utils.header("Running step %s on plc %s"%(stepname,plcname)) - step_result = method(obj,self.options) + force_msg="" + if force: force_msg=" (forced)" + utils.header("********** RUNNING step %s%s on plc %s"%(stepname,force_msg,plcname)) + step_result = method(obj) if step_result: utils.header('********** SUCCESSFUL step %s on %s'%(stepname,plcname)) else: overall_result = False spec['disabled'] = True - utils.header('********** Step %s on %s FAILED - discarding that plc from further steps'%(stepname,plcname)) + utils.header('********** FAILED Step %s on %s - discarding that plc from further steps'%(stepname,plcname)) except: overall_result=False spec['disabled'] = True - utils.header ('********** Step %s on plc %s FAILED (exception) - discarding this plc from further steps'%(stepname,plcname)) traceback.print_exc() + utils.header ('********** FAILED (exception) Step %s on plc %s - discarding this plc from further steps'%(stepname,plcname)) + + # do not run, just display it's skipped + else: + utils.header("********** IGNORED Plc %s is disabled - skipping step %s"%(plcname,stepname)) + return overall_result # wrapper to run, returns a shell-compatible result