From c0411452aa4c4473fb217252eede77e1a6c0d563 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Fri, 16 Dec 2011 14:03:04 +0000 Subject: improved statisc output --- src/integration-tests/gnunet_testing.py.in | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in index 4b667a270..81dff3f06 100644 --- a/src/integration-tests/gnunet_testing.py.in +++ b/src/integration-tests/gnunet_testing.py.in @@ -67,8 +67,6 @@ class Check: print (str(pos) +' out of '+ str (pos+neg) + ' conditions fulfilled') return self.fulfilled - - class Condition: def __init__(self): self.fulfilled = False @@ -115,10 +113,11 @@ class StatisticsCondition (Condition): self.subsystem = subsystem; self.name = name; self.value = value; + self.result = -1; def check(self): if (self.fulfilled == False): - res = self.peer.check (self.subsystem, self.name, self.value); - if (res == True): + self.result = self.peer.check (self.subsystem, self.name, self.value); + if (self.result == self.value): self.fulfilled = True return True else: @@ -127,9 +126,21 @@ class StatisticsCondition (Condition): return True def eval(self, failed_only): if ((self.fulfilled == False) and (failed_only == True)): - print str(self.type) + ' condition for value "'+str(self.value)+'" in subsystem "' + self.subsystem +'" : "' + self.name +'" was ' + str(self.fulfilled) + if (self.fulfilled == False): + fail = " FAIL!" + op = " != " + else: + fail = "" + op = " == " + print self.peer.cfg + " " + str(self.type) + ' condition in subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : ' + str(self.value) + op + str(self.result) + fail elif (failed_only == False): - print str(self.type) + ' condition for value "'+str(self.value)+'" in subsystem "' + self.subsystem +'" : "' + self.name +'" was ' + str(self.fulfilled) + if (self.fulfilled == False): + fail = " FAIL!" + op = " != " + else: + fail = "" + op = " == " + print self.peer.cfg + " " + str(self.type) + ' condition in subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : ' + str(self.value) + op + str(self.result) + fail return self.fulfilled class Test: @@ -206,7 +217,8 @@ class Peer: #server.expect ("stdout", re.compile (r"")) test = server.read("stdout", 10240) if (test.find(str(value)) == -1): - return False + return value else: - return True + return value + \ No newline at end of file -- cgit v1.2.3