X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestMain.py;h=859969594ddc6fbcee270d127ec6896094be96c0;hb=1b53e7fba94188d65f5bbf6542a3f4298dad57ff;hp=09784bcdc946ccd05ba5be63bd7e98280a0cdd55;hpb=3e66aad111ca31d9c5ffa957db12a27cf03e6ae8;p=tests.git

diff --git a/system/TestMain.py b/system/TestMain.py
index 09784bc..8599695 100755
--- a/system/TestMain.py
+++ b/system/TestMain.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # $Id$
 
-import os, sys
+import sys, os, os.path
 from optparse import OptionParser
 import traceback
 
@@ -21,10 +21,16 @@ class TestMain:
                      'clear_ssh_config','store_keys', 'initscripts', 
                      'sites', 'nodes', 'slices', 
                      'bootcd', 'nodegroups', 
-                     'start_nodes','standby', 'check_nodesStatus','check_nodesConnectivity', 'check_slices' ]
+                     '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',
-                    'stop_nodes' ,  'db_dump' , 'db_restore',
+                    'list_all_qemus', 'kill_qemus', 'stop_nodes' ,  
+                    'db_dump' , 'db_restore',
+                    'standby_1 through 20',
                     ]
     default_build_url = "http://svn.planet-lab.org/svn/build/trunk"
 
@@ -147,6 +153,8 @@ steps refer to a method in TestPlc or to a step_* module
 
         # store self.path in options.path for the various callbacks
         self.options.path = self.path
+        # this is useful when propagating on host boxes, to avoid conflicts
+        self.options.buildname = os.path.basename (os.path.abspath (self.path))
 
         if self.options.verbose:
             self.show_env(self.options,"Verbose")
@@ -207,15 +215,15 @@ steps refer to a method in TestPlc or to a step_* module
                         utils.header("Running step %s on plc %s"%(stepname,plcname))
                         step_result = method(obj,self.options)
                         if step_result:
-                            utils.header('Successful step %s on %s'%(stepname,plcname))
+                            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('********** Step %s on %s FAILED - 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))
+                        utils.header ('********** Step %s on plc %s FAILED (exception) - discarding this plc from further steps'%(stepname,plcname))
                         traceback.print_exc()
         return overall_result