another round of rework

[tests.git] / system / TestMain.py

diff --git a/system/TestMain.py b/system/TestMain.py
index 52d688f..e4dda38 100755 (executable)
--- a/system/TestMain.py
+++ b/system/TestMain.py
@@ -10,26 +10,29 @@ from TestPlc import TestPlc
 from TestSite import TestSite
 from TestNode import TestNode
 
+SEP='<sep>'
+
 class TestMain:
 
     subversion_id = "$Id$"
 
-    default_config = [ 'onelab' ]
+    default_config = [ 'main' , '1vnodes' , '1testbox64' ]
 
-    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_20', 
-                     'nodes_booted', 'nodes_ssh', 'check_slices','check_initscripts',
-                     'force_kill_qemus', ]
-    other_steps = [ 'stop_all_vservers','fresh_install', 'stop','check_tcp', 
-                    'clean_sites', 'clean_nodes', 'clean_slices', 'clean_keys',
-                    'list_all_qemus', 'list_qemus', 'stop_nodes' ,  
+    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_kill_qemus', 'force_gather_logs' ]
+    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', SEP,
                     ]
     default_build_url = "http://svn.planet-lab.org/svn/build/trunk"
 
@@ -40,7 +43,7 @@ class TestMain:
     @staticmethod
     def show_env (options, message):
         utils.header (message)
-        utils.pprint("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,6 +80,9 @@ 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,
@@ -94,6 +104,10 @@ steps refer to a method in TestPlc or to a step_* module
                           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
@@ -156,6 +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
 
+        # 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))
 
@@ -176,13 +201,13 @@ steps refer to a method in TestPlc or to a step_* module
         # show config
         if not self.options.quiet:
             utils.show_test_spec("Test specifications",all_plc_specs)
-        # build a TestPlc object from the result
+        # 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__
@@ -214,7 +239,6 @@ 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,force) in all_step_infos:
@@ -227,7 +251,7 @@ steps refer to a method in TestPlc or to a step_* module
                         force_msg=""
                         if force: force_msg=" (forced)"
                         utils.header("********** RUNNING step %s%s on plc %s"%(stepname,force_msg,plcname))
-                        step_result = method(obj,self.options)
+                        step_result = method(obj)
                         if step_result:
                             utils.header('********** SUCCESSFUL step %s on %s'%(stepname,plcname))
                         else: