diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-02-18 10:17:45 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-02-18 10:17:45 +0100 |
commit | 0ca5d7e2a0d80732fcab9422281da7b80964da6b (patch) | |
tree | 37e4680b9b35fa6d8fcf5d6c6355aef6fd24897d | |
parent | 003606cc941a4580d787c9970193bb22e307c413 (diff) | |
download | gnunet-0ca5d7e2a0d80732fcab9422281da7b80964da6b.tar.gz gnunet-0ca5d7e2a0d80732fcab9422281da7b80964da6b.zip |
rexxnor fix for string to digit
-rw-r--r-- | src/integration-tests/gnunet_testing.py.in | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in index dcfc99e8d..5767a455a 100644 --- a/src/integration-tests/gnunet_testing.py.in +++ b/src/integration-tests/gnunet_testing.py.in | |||
@@ -176,7 +176,7 @@ class StatisticsCondition(Condition): | |||
176 | def check(self): | 176 | def check(self): |
177 | if (self.fulfilled == False): | 177 | if (self.fulfilled == False): |
178 | self.result = self.peer.get_statistics_value(self.subsystem, self.name) | 178 | self.result = self.peer.get_statistics_value(self.subsystem, self.name) |
179 | if (str(self.result) == str(self.value)): | 179 | if (self.result == str(self.value)): |
180 | self.fulfilled = True | 180 | self.fulfilled = True |
181 | return True | 181 | return True |
182 | else: | 182 | else: |
@@ -185,10 +185,6 @@ class StatisticsCondition(Condition): | |||
185 | return True | 185 | return True |
186 | 186 | ||
187 | def evaluate(self, failed_only): | 187 | def evaluate(self, failed_only): |
188 | if (self.result == -1): | ||
189 | res = b'NaN' | ||
190 | else: | ||
191 | res = str(self.result).encode('utf-8') | ||
192 | if (self.fulfilled == False): | 188 | if (self.fulfilled == False): |
193 | fail = b" FAIL!" | 189 | fail = b" FAIL!" |
194 | op = b" != " | 190 | op = b" != " |
@@ -210,7 +206,7 @@ class StatisticsCondition(Condition): | |||
210 | # op + | 206 | # op + |
211 | # res + | 207 | # res + |
212 | # fail) | 208 | # fail) |
213 | logger.debug('%s %s %s condition in subsystem %s : %s : (expected/real value) %s %s %s %s', self.peer.id[:4], self.peer.cfg.encode('utf-8'), str(self.type).encode('utf-8'), self.subsystem.encode('utf-8').ljust(12), self.name.encode('utf-8').ljust(30), str(self.value).encode('utf-8'), op, res, fail) | 209 | logger.debug('%s %s %s condition in subsystem %s : %s : (expected/real value) %s %s %s %s', self.peer.id[:4], self.peer.cfg.encode('utf-8'), str(self.type).encode('utf-8'), self.subsystem.encode('utf-8').ljust(12), self.name.encode('utf-8').ljust(30), str(self.value).encode('utf-8'), op, self.result, fail) |
214 | return self.fulfilled | 210 | return self.fulfilled |
215 | 211 | ||
216 | 212 | ||
@@ -232,7 +228,7 @@ class EqualStatisticsCondition(Condition): | |||
232 | if (self.fulfilled == False): | 228 | if (self.fulfilled == False): |
233 | self.result = self.peer.get_statistics_value(self.subsystem, self.name) | 229 | self.result = self.peer.get_statistics_value(self.subsystem, self.name) |
234 | self.result2 = self.peer2.get_statistics_value(self.subsystem2, self.name2) | 230 | self.result2 = self.peer2.get_statistics_value(self.subsystem2, self.name2) |
235 | if (str(self.result) == str(self.result2)): | 231 | if (self.result == self.result2): |
236 | self.fulfilled = True | 232 | self.fulfilled = True |
237 | return True | 233 | return True |
238 | else: | 234 | else: |
@@ -244,11 +240,11 @@ class EqualStatisticsCondition(Condition): | |||
244 | if (self.result == -1): | 240 | if (self.result == -1): |
245 | res = b'NaN' | 241 | res = b'NaN' |
246 | else: | 242 | else: |
247 | res = str(self.result).encode('utf-8') | 243 | res = self.result |
248 | if (self.result2 == -1): | 244 | if (self.result2 == -1): |
249 | res2 = b'NaN' | 245 | res2 = b'NaN' |
250 | else: | 246 | else: |
251 | res2 = str(self.result2).encode('utf-8') | 247 | res2 = self.result2 |
252 | if (self.fulfilled == False): | 248 | if (self.fulfilled == False): |
253 | fail = b" FAIL!" | 249 | fail = b" FAIL!" |
254 | op = b" != " | 250 | op = b" != " |
@@ -262,7 +258,7 @@ class EqualStatisticsCondition(Condition): | |||
262 | # b'" "' + | 258 | # b'" "' + |
263 | # self.name.encode('utf-8').ljust(30) + | 259 | # self.name.encode('utf-8').ljust(30) + |
264 | # b'" == ' + | 260 | # b'" == ' + |
265 | # str(self.result).encode('utf-8') + | 261 | # self.result + |
266 | # b" " + | 262 | # b" " + |
267 | # self.peer2.id[:4] + | 263 | # self.peer2.id[:4] + |
268 | # b' "' + | 264 | # b' "' + |
@@ -270,8 +266,8 @@ class EqualStatisticsCondition(Condition): | |||
270 | # b'" ' + | 266 | # b'" ' + |
271 | # self.name2.encode('utf-8').ljust(30) + | 267 | # self.name2.encode('utf-8').ljust(30) + |
272 | # b'" ' + | 268 | # b'" ' + |
273 | # str(self.result2).encode('utf-8')) | 269 | # self.result2) |
274 | logger.debug('%s %s %s == %s %s %s %s %s', self.peer.id[:4], self.subsystem.encode('utf-8').ljust(12), self.name.encode('utf-8').ljust(30), str(self.result).encode('utf-8'), self.peer2.id[:4], self.subsystem2.encode('uft-8').ljust(12), self.name2.encode('utf-8').ljust(30), str(self.result2).encode('utf-8')) | 270 | logger.debug('%s %s %s == %s %s %s %s %s', self.peer.id[:4], self.subsystem.encode('utf-8').ljust(12), self.name.encode('utf-8').ljust(30), self.result, self.peer2.id[:4], self.subsystem2.encode('uft-8').ljust(12), self.name2.encode('utf-8').ljust(30), self.result2) |
275 | return self.fulfilled | 271 | return self.fulfilled |
276 | 272 | ||
277 | 273 | ||
@@ -380,10 +376,11 @@ class Peer(object): | |||
380 | tests = (tests[0][:-1], tests[1], tests[2]) | 376 | tests = (tests[0][:-1], tests[1], tests[2]) |
381 | tests = tests[0] | 377 | tests = tests[0] |
382 | # print("running gnunet-statistics " + self.cfg + " for " + name + "/" + subsystem + " yields " + tests.decode("utf-8")) | 378 | # print("running gnunet-statistics " + self.cfg + " for " + name + "/" + subsystem + " yields " + tests.decode("utf-8")) |
383 | logger.debug('running gnunet-statistics %s for %s "/" %s yields %s', self.cfg, name, subsystem, test.decode("utf-8")) | 379 | logger.debug('running gnunet-statistics %s for %s "/" %s yields %s', self.cfg, name, subsystem, test.decode("utf-8")) |
384 | if (tests.isdigit() == True): | 380 | result = tests.decode("utf-8").strip() |
385 | return tests | 381 | if (result.isdigit() == True): |
382 | return result | ||
386 | else: | 383 | else: |
387 | # print("Invalid statistics value: " + str(tests) + " is not a number!") | 384 | # print("Invalid statistics value: " + str(tests) + " is not a number!") |
388 | logger.debug('Invalid statistics value: %s is not a number!', str(tests)) | 385 | logger.debug('Invalid statistics value: %s is not a number!', result) |
389 | return -1 | 386 | return -1 |