diff options
-rw-r--r-- | src/integration-tests/gnunet_testing.py.in | 26 | ||||
-rwxr-xr-x | src/integration-tests/test_integration_clique_nat.py.in | 2 |
2 files changed, 13 insertions, 15 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 | ||
146 | class Test: | 144 | class Test: |
diff --git a/src/integration-tests/test_integration_clique_nat.py.in b/src/integration-tests/test_integration_clique_nat.py.in index c8e9afefa..dfcfd7c3d 100755 --- a/src/integration-tests/test_integration_clique_nat.py.in +++ b/src/integration-tests/test_integration_clique_nat.py.in | |||
@@ -42,7 +42,7 @@ from gnunet_testing import * | |||
42 | #definitions | 42 | #definitions |
43 | testname = "test_integration_clique_nat" | 43 | testname = "test_integration_clique_nat" |
44 | verbose = True | 44 | verbose = True |
45 | check_timeout = 120 | 45 | check_timeout = 30 |
46 | 46 | ||
47 | 47 | ||
48 | def cleanup (): | 48 | def cleanup (): |