aboutsummaryrefslogtreecommitdiff
path: root/src/integration-tests/gnunet_testing.py.in
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2011-12-16 16:27:59 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2011-12-16 16:27:59 +0000
commit04b917265ee942383b8366d9aa9c037cfa89c038 (patch)
treef5168289b7a44a03b3923261076eaf5948c14f26 /src/integration-tests/gnunet_testing.py.in
parent82f771a0779a45d69a6ae2789f10eef2a2a832b1 (diff)
downloadgnunet-04b917265ee942383b8366d9aa9c037cfa89c038.tar.gz
gnunet-04b917265ee942383b8366d9aa9c037cfa89c038.zip
improvements and fixes
Diffstat (limited to 'src/integration-tests/gnunet_testing.py.in')
-rw-r--r--src/integration-tests/gnunet_testing.py.in26
1 files changed, 12 insertions, 14 deletions
diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in
index d53aa1592..0b7f87fa4 100644
--- a/src/integration-tests/gnunet_testing.py.in
+++ b/src/integration-tests/gnunet_testing.py.in
@@ -125,22 +125,20 @@ class StatisticsCondition (Condition):
125 else: 125 else:
126 return True 126 return True
127 def eval(self, failed_only): 127 def eval(self, failed_only):
128 if (self.result == -1):
129 res = 'NaN'
130 else:
131 res = str(self.result)
132 if (self.fulfilled == False):
133 fail = " FAIL!"
134 op = " != "
135 else:
136 fail = ""
137 op = " == "
128 if ((self.fulfilled == False) and (failed_only == True)): 138 if ((self.fulfilled == False) and (failed_only == True)):
129 if (self.fulfilled == False): 139 print self.peer.cfg + " " + str(self.type) + ' condition in subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : ' + str(self.value) + op + res + fail
130 fail = " FAIL!"
131 op = " != "
132 else:
133 fail = ""
134 op = " == "
135 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
136 elif (failed_only == False): 140 elif (failed_only == False):
137 if (self.fulfilled == False): 141 print self.peer.cfg + " " + str(self.type) + ' condition in subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : ' + str(self.value) + op + res + fail
138 fail = " FAIL!"
139 op = " != "
140 else:
141 fail = ""
142 op = " == "
143 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
144 return self.fulfilled 142 return self.fulfilled
145 143
146class Test: 144class Test: