use consitent convention for displaying step names

[tests.git] / system / TestMain.py

diff --git a/system/TestMain.py b/system/TestMain.py
index 4241e6a..3e17881 100755 (executable)
--- a/system/TestMain.py
+++ b/system/TestMain.py
@@ -6,9 +6,9 @@
 import sys, os, os.path
 from optparse import OptionParser
 import traceback
-from time import strftime
 import readline
 import glob
+from datetime import datetime
 
 import utils
 from TestPlc import TestPlc, Ignored
@@ -90,7 +90,8 @@ class TestMain:
     subversion_id = "Now using git -- version tracker broken"
 
     default_config = [ 'default' ] 
-    default_rspec_styles = [ 'pl', 'pg' ]
+#    default_rspec_styles = [ 'pl', 'pg' ]
+    default_rspec_styles = [ 'pg' ]
 
     default_build_url = "git://git.onelab.eu/tests"
 
@@ -173,10 +174,6 @@ steps refer to a method in TestPlc or to a step_* module
                           help="Specify the set of hostnames for the boxes that host the nodes")
         parser.add_option("-N","--nodes",action="append", dest="ips_vnode", default=[],
                           help="Specify the set of hostname/IP's to use for vnodes")
-        parser.add_option ('-X', "--lxc",action='store_true',dest='plcs_use_lxc',default=True,
-                           help='use lxc-enabled plc boxes instead of vs-enabled ones')
-        parser.add_option ('-S', "--vs",action='store_false',dest='plcs_use_lxc',
-                           help='use lxc-enabled plc boxes instead of vs-enabled ones')
         parser.add_option("-s","--size",action="store",type="int",dest="size",default=1,
                           help="sets test size in # of plcs - default is 1")
         parser.add_option("-q","--qualifier",action="store",type="int",dest="qualifier",default=None,
@@ -193,9 +190,6 @@ steps refer to a method in TestPlc or to a step_* module
                           help="prompts before each step")
         parser.add_option("-n","--dry-run", action="store_true", dest="dry_run", default=False,
                           help="Show environment and exits")
-# dropped when added Completer.py
-#        parser.add_option("-r","--restart-nm", action="store_true", dest="forcenm", default=False, 
-#                          help="Force the NM to restart in ssh_slices step")
         parser.add_option("-t","--trace", action="store", dest="trace_file", default=None,
                           help="Trace file location")
         (self.options, self.args) = parser.parse_args()
@@ -228,7 +222,6 @@ steps refer to a method in TestPlc or to a step_* module
             ('personality','arg-personality',"linux64",None),
             ('pldistro','arg-pldistro',"onelab",None),
             ('fcdistro','arg-fcdistro','f14',None),
-            ('plcs_use_lxc','arg-plcs-use-lxc',False,None),
             ) :
 #            print 'handling',recname
             path=filename
@@ -337,7 +330,6 @@ steps refer to a method in TestPlc or to a step_* module
                 raise
 
         # provision on local substrate
-        if self.options.plcs_use_lxc: LocalSubstrate.local_substrate.rescope (plcs_on_vs=False, plcs_on_lxc=True)
         all_plc_specs = LocalSubstrate.local_substrate.provision(all_plc_specs,self.options)
 
         # remember substrate IP address(es) for next run
@@ -347,7 +339,7 @@ steps refer to a method in TestPlc or to a step_* module
         ips_bplc_file.close()
         ips_vplc_file=open('arg-ips-vplc','w')
         for plc_spec in all_plc_specs:
-            ips_vplc_file.write("%s\n"%plc_spec['PLC_API_HOST'])
+            ips_vplc_file.write("%s\n"%plc_spec['settings']['PLC_API_HOST'])
         ips_vplc_file.close()
         # ditto for nodes
         ips_bnode_file=open('arg-ips-bnode','w')
@@ -415,7 +407,7 @@ steps refer to a method in TestPlc or to a step_* module
 
         # do all steps on all plcs
         TIME_FORMAT="%H-%M-%S"
-        TRACE_FORMAT="TRACE: %(plc_counter)d %(beg)s->%(end)s status=%(status)s step=%(stepname)s plc=%(plcname)s force=%(force)s\n"
+        TRACE_FORMAT="TRACE: %(plc_counter)d %(begin)s->%(seconds)ss=%(duration)s status=%(status)s step=%(stepname)s plc=%(plcname)s force=%(force)s\n"
         for (stepname,method,force,cross,qualifier) in all_step_infos:
             plc_counter=0
             for (spec,plc_obj) in all_plcs:
@@ -427,7 +419,8 @@ steps refer to a method in TestPlc or to a step_* module
                 across_plcs = [ o for (s,o) in all_plcs if o!=plc_obj ]
 
                 # run the step
-                beg=strftime(TIME_FORMAT)
+                beg_time = datetime.now()
+                begin = beg_time.strftime(TIME_FORMAT)
                 if not spec['failed_step'] or force or self.options.interactive or self.options.keep_going:
                     skip_step=False
                     if self.options.interactive:
@@ -485,14 +478,14 @@ steps refer to a method in TestPlc or to a step_* module
                         else:
                             overall_result = 'FAILURE'
                             spec['failed_step'] = stepname
-                            utils.header('********** %d FAILED Step %s on %s (discarded from further steps)'\
+                            utils.header('********** %d FAILED step %s on %s (discarded from further steps)'\
                                              %(plc_counter,stepname,plcname))
                             status="KO"
                     except:
                         overall_result='FAILURE'
                         spec['failed_step'] = stepname
                         traceback.print_exc()
-                        utils.header ('********** %d FAILED (exception) Step %s on %s (discarded from further steps)'\
+                        utils.header ('********** %d FAILED (exception) step %s on %s (discarded from further steps)'\
                                           %(plc_counter,stepname,plcname))
                         status="KO"
 
@@ -502,7 +495,9 @@ steps refer to a method in TestPlc or to a step_* module
                     utils.header("********** %d SKIPPED Step %s on %s (%s)"%(plc_counter,stepname,plcname,why))
                     status="UNDEF"
                 if not self.options.dry_run:
-                    end=strftime(TIME_FORMAT)
+                    delay = datetime.now()-beg_time
+                    seconds = int(delay.total_seconds())
+                    duration = str(delay)
                     # always do this on stdout
                     print TRACE_FORMAT%locals()
                     # duplicate on trace_file if provided