aboutsummaryrefslogtreecommitdiff
path: root/src/integration-tests/gnunet_testing.py.in
diff options
context:
space:
mode:
Diffstat (limited to 'src/integration-tests/gnunet_testing.py.in')
-rw-r--r--src/integration-tests/gnunet_testing.py.in11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in
index 253797249..d935bc419 100644
--- a/src/integration-tests/gnunet_testing.py.in
+++ b/src/integration-tests/gnunet_testing.py.in
@@ -147,10 +147,8 @@ class StatisticsCondition (Condition):
147 else: 147 else:
148 fail = "" 148 fail = ""
149 op = " == " 149 op = " == "
150 if ((self.fulfilled == False) and (failed_only == True)): 150 if (((self.fulfilled == False) and (failed_only == True)) or (failed_only == False)):
151 print self.peer.id[:4] + " " +self.peer.cfg + " " + str(self.type) + ' condition in subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : (expected/real value) ' + str(self.value) + op + res + fail 151 print self.peer.id[:4] + " " +self.peer.cfg + " " + str(self.type) + ' condition in subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : (expected/real value) ' + str(self.value) + op + res + fail
152 elif (failed_only == False):
153 print self.peer.id[:4] + " " +self.peer.cfg + " " + str(self.type) + ' condition in subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : (expected/real value) ' + str(self.value) + op + res + fail
154 return self.fulfilled 152 return self.fulfilled
155 153
156# Specify two statistic values and check if they are equal 154# Specify two statistic values and check if they are equal
@@ -192,11 +190,8 @@ class EqualStatisticsCondition (Condition):
192 else: 190 else:
193 fail = "" 191 fail = ""
194 op = " == " 192 op = " == "
195 if ((self.fulfilled == False) and (failed_only == True)): 193 if (((self.fulfilled == False) and (failed_only == True)) or (failed_only == False)):
196 print self.peer.id[:4] + " " + self.subsystem.ljust(12) + " " + str(self.result) +" " + self.peer2.id[:4] + " " + self.subsystem2.ljust(12) + " " + str(self.result2) 194 print self.peer.id[:4] + ' "' + self.subsystem.ljust(12) + '" "' + self.name.ljust(30) + '" == ' + str(self.result) +" " + self.peer2.id[:4] + ' "' + self.subsystem2.ljust(12) + '" '+ self.name2.ljust(30) + '" ' + str(self.result2)
197 #print self.peer.id[:4] + " " + str(self.type) + ' condition in subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : (expected/real value) ' + str(self.value) + op + res + fail
198 elif (failed_only == False):
199 print self.peer.id[:4] + " " + self.subsystem.ljust(12) + " " + str(self.result) +" " + self.peer2.id[:4] + " " + self.subsystem2.ljust(12) + " " + str(self.result2)
200 return self.fulfilled 195 return self.fulfilled
201 196
202class Test: 197class Test: