drop support for vs-hosted plcs

[tests.git] / system / Substrate.py

diff --git a/system/Substrate.py b/system/Substrate.py
index 0bd7d3e..304373e 100644 (file)
--- a/system/Substrate.py
+++ b/system/Substrate.py
@@ -882,15 +882,17 @@ class TestInstance:
         # 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()
+        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 != '=':
+            msg = '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="%msg + " ".join( [ "%s@%s"%(s,i) if i else s for (i,s) in self.broken_steps ] ) + "]"
         return msg
 
 class TestBox (Box):
@@ -1029,7 +1031,7 @@ class Options: pass
 
 class Substrate:
 
-    def __init__ (self, plcs_on_vs=True, plcs_on_lxc=False):
+    def __init__ (self, plcs_on_vs=False, plcs_on_lxc=True):
         self.options=Options()
         self.options.dry_run=False
         self.options.verbose=False
@@ -1344,7 +1346,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,