X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FSubstrate.py;h=73b66c613799298a144ab6cda6572f2437f4c2fe;hb=a30d5259f12b1783a86f18cf841140550cb223d8;hp=f5332048420698734d0f38337a610c6c97e7252f;hpb=0bc0383ee751deaa4b651bfd18c7363ec5e90292;p=tests.git

diff --git a/system/Substrate.py b/system/Substrate.py
index f533204..73b66c6 100644
--- a/system/Substrate.py
+++ b/system/Substrate.py
@@ -869,18 +869,30 @@ 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
+        letter2 = self.second_letter()
+        double += letter2
         msg = " %s %s =="%(double,self.buildname)
         if not self.pids:       pass
         elif len(self.pids)==1: msg += " (pid=%s)"%self.pids[0]
         else:                   msg += " !!!pids=%s!!!"%self.pids
         msg += " @%s"%self.pretty_timestamp()
-        if self.broken_steps:
+        if letter2 != '=':
+            msg2 = ( ' BROKEN' if letter2 == 'B' else ' WARNING' )
             # sometimes we have an empty plcindex
-            msg += " [BROKEN=" + " ".join( [ "%s@%s"%(s,i) if i else s for (i,s) in self.broken_steps ] ) + "]"
+            msg += " [%s="%msg2 + " ".join( [ "%s@%s"%(s,i) if i else s for (i,s) in self.broken_steps ] ) + "]"
         return msg
 
 class TestBox (Box):
@@ -952,7 +964,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:
@@ -1019,16 +1031,14 @@ class Options: pass
 
 class Substrate:
 
-    def __init__ (self, plcs_on_vs=True, plcs_on_lxc=False):
+    def __init__ (self):
         self.options=Options()
         self.options.dry_run=False
         self.options.verbose=False
         self.options.reboot=False
         self.options.soft=False
         self.test_box = TestBox (self.test_box_spec())
-        self.build_vs_boxes = [ BuildVsBox(h) for h in self.build_vs_boxes_spec() ]
         self.build_lxc_boxes = [ BuildLxcBox(h) for h in self.build_lxc_boxes_spec() ]
-        self.plc_vs_boxes = [ PlcVsBox (h,m) for (h,m) in self.plc_vs_boxes_spec ()]
         self.plc_lxc_boxes = [ PlcLxcBox (h,m) for (h,m) in self.plc_lxc_boxes_spec ()]
         self.qemu_boxes = [ QemuBox (h,m) for (h,m) in self.qemu_boxes_spec ()]
         self._sensed=False
@@ -1036,20 +1046,13 @@ class Substrate:
         self.vplc_pool = Pool (self.vplc_ips(),"for vplcs",self)
         self.vnode_pool = Pool (self.vnode_ips(),"for vnodes",self)
         
-        self.rescope (plcs_on_vs=plcs_on_vs, plcs_on_lxc=plcs_on_lxc)
-
-    # which plc boxes are we interested in ?
-    def rescope (self, plcs_on_vs, plcs_on_lxc):
-        self.build_boxes = self.build_vs_boxes + self.build_lxc_boxes
-        self.plc_boxes=[]
-        if plcs_on_vs: self.plc_boxes += self.plc_vs_boxes
-        if plcs_on_lxc: self.plc_boxes += self.plc_lxc_boxes
+        self.build_boxes = self.build_lxc_boxes
+        self.plc_boxes = self.plc_lxc_boxes
         self.default_boxes = self.plc_boxes + self.qemu_boxes
         self.all_boxes = self.build_boxes + [ self.test_box ] + self.plc_boxes + self.qemu_boxes
 
     def summary_line (self):
         msg  = "["
-        msg += " %d vp"%len(self.plc_vs_boxes)
         msg += " %d xp"%len(self.plc_lxc_boxes)
         msg += " %d tried plc boxes"%len(self.plc_boxes)
         msg += "]"
@@ -1334,7 +1337,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,
@@ -1351,8 +1354,6 @@ class Substrate:
                            help='dry run mode')
         (self.options,args)=parser.parse_args()
 
-        self.rescope (plcs_on_vs=True, plcs_on_lxc=True)
-
         boxes=args
         if self.options.testbox: boxes += [self.test_box]
         if self.options.builds: boxes += self.build_boxes