X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FSubstrate.py;h=304373e28e49f7befec79ba8cc460a4c22fadce4;hb=161ead318cbbb6c79437f209052e8a938cce7ec7;hp=b75ed5cdd35d9a8a71a42591debbd70d6cf39eac;hpb=b47b8fa60bc6c6c554e345205aca15fed8db8c0c;p=tests.git diff --git a/system/Substrate.py b/system/Substrate.py index b75ed5c..304373e 100644 --- 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