new class Completer for simplifying all the code that tries to monitor

[tests.git] / system / TestMain.py

diff --git a/system/TestMain.py b/system/TestMain.py
index e63d1ca..ae4a861 100755 (executable)
--- a/system/TestMain.py
+++ b/system/TestMain.py
@@ -40,18 +40,33 @@ class Step:
                 print "macro step %s not found in macros.py (%s) - exiting"%(self.display(),e)
                 raise
 
-    def print_doc (self):
+    def print_doc (self,level=0):
+        tab=32
+        trail=8
         if self.native:
-            print '*',self.display(),"\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.display(),"\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.display(),"\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):
@@ -174,8 +189,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()
@@ -276,6 +292,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=[]