typo

[tests.git] / system / Substrate.py

diff --git a/system/Substrate.py b/system/Substrate.py
index f533204..b75ed5c 100644 (file)
--- a/system/Substrate.py
+++ b/system/Substrate.py
@@ -869,10 +869,20 @@ class TestInstance:
     def set_broken (self, plcindex, step): 
         self.broken_steps.append ( (plcindex, step,) )
 
+    def second_letter (self):
+        if not self.broken_steps: return '='
+        else:
+            really_broken = [ step for (i,step) in self.broken_steps if '_ignore' not in step ]
+            # W is for warning like what's in the build mail
+            if len(really_broken)==0: return 'W'
+            else: return 'B'
+
     def line (self):
-        double='=='
-        if self.pids: double='*'+double[1]
-        if self.broken_steps: double=double[0]+'B'
+        # make up a 2-letter sign
+        # first letter : '=', unless build is running : '*'
+        double = '*' if self.pids else '='
+        # second letter : '=' if fine, 'W' for warnings (only ignored steps) 'B' for broken
+        double += self.second_letter()
         msg = " %s %s =="%(double,self.buildname)
         if not self.pids:       pass
         elif len(self.pids)==1: msg += " (pid=%s)"%self.pids[0]
@@ -952,7 +962,7 @@ class TestBox (Box):
         # let's try to be robust here -- tests that fail very early like e.g.
         # "Cannot make space for a PLC instance: vplc IP pool exhausted", that occurs as part of provision
         # will result in a 'trace' symlink to an inexisting 'trace-<>.txt' because no step has gone through
-        # simple 'trace' sohuld exist though as it is created by run_log
+        # simple 'trace' should exist though as it is created by run_log
         command=['bash','-c',"grep KO /root/*/logs/trace /dev/null 2>&1" ]
         trace_lines=self.backquote_ssh (command).split('\n')
         for line in trace_lines:
@@ -1334,7 +1344,7 @@ class Substrate:
         parser.add_option ('-r',"--reboot",action='store_true',dest='reboot',default=False,
                            help='reboot mode (use shutdown -r)')
         parser.add_option ('-s',"--soft",action='store_true',dest='soft',default=False,
-                           help='soft mode for reboot (vserver stop or kill qemus)')
+                           help='soft mode for reboot (terminates processes)')
         parser.add_option ('-t',"--testbox",action='store_true',dest='testbox',default=False,
                            help='add test box') 
         parser.add_option ('-b',"--build",action='store_true',dest='builds',default=False,