has option -X (old) and -S (new) to select between a

[tests.git] / system / TestMain.py

diff --git a/system/TestMain.py b/system/TestMain.py
index f78407c..a325223 100755 (executable)
--- a/system/TestMain.py
+++ b/system/TestMain.py
@@ -24,37 +24,53 @@ class Step:
 
     natives=TestPlc.__dict__
 
+    def display (self): return self.name.replace('_','-')
+    def internal (self): return self.name.replace('-','_')
+
     def __init__ (self, name):
-        self.name=name.replace('-','_')
+        self.name=name
         # a native step is implemented as a method on TestPlc
-        self.native = name in Step.natives
+        self.native = self.internal() in Step.natives
         if self.native:
-            self.method=Step.natives[self.name]
+            self.method=Step.natives[self.internal()]
         else:
             try:
-                self.substeps=sequences[self.name]
+                self.substeps=sequences[self.internal()]
             except Exception,e:
-                print "macro step %s not found in macros.py (%s) - exiting"%(self.name,e)
+                print "macro step %s not found in macros.py (%s) - exiting"%(self.display(),e)
                 raise
 
-    def norm_name (self): return self.name.replace('_','-')
-
-    def print_doc (self):
+    def print_doc (self,level=0):
+        tab=32
+        trail=8
         if self.native:
-            print '*',self.norm_name(),"\r",4*"\t",
+            start=level*' '+'* '
+            # 2 is the len of '* '
+            width=tab-level-2
+            format="%%-%ds"%width
+            line=start+format%self.display()
+            print line,
             try:
                 print self.method.__doc__
             except:
                 print "*** no doc found"
         else:
-            print '*',self.norm_name(),"\r",3*"\t","========== BEG MACRO step"
+            beg_start=level*' '+'>>> '
+            end_start=level*' '+'<<< '
+            trailer=trail*'-'
+            # 4 is the len of '>>> '
+            width=tab-level-4-trail
+            format=("%%-%ds"%width)
+            beg_line=beg_start+format%self.display()+trail*'>'
+            end_line=end_start+format%self.display()+trail*'<'
+            print beg_line
             for step in self.substeps:
-                Step(step).print_doc()
-            print '*',self.norm_name(),"\r",3*"\t","========== END MACRO step"
+                Step(step).print_doc(level+1)
+            print end_line
 
     # return a list of (name, method) for all native steps involved
     def tuples (self):
-        if self.native: return [ (self.name, self.method,) ]
+        if self.native: return [ (self.internal(), self.method,) ]
         else:
             result=[]
             for substep in [ Step(name) for name in self.substeps ] : 
@@ -155,7 +171,9 @@ 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',
+        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")
@@ -173,8 +191,9 @@ 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")
-        parser.add_option("-r","--restart-nm", action="store_true", dest="forcenm", default=False, 
-                          help="Force the NM to restart in ssh_slices step")
+# 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()
@@ -275,6 +294,7 @@ 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 ]
 
         # exclude
         selected=[]