diff options
author | ng0 <ng0@n0.is> | 2019-02-16 18:53:08 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-02-16 18:53:08 +0000 |
commit | 815fc58842343a3b407c957e288f63718d3caebb (patch) | |
tree | c5afa55bbeb4347b4f5d929e17e29fe2b374ea26 /src/integration-tests/gnunet_testing.py.in | |
parent | d6bc987837d1c91653b0b775ace276eb9752c0a8 (diff) | |
download | gnunet-815fc58842343a3b407c957e288f63718d3caebb.tar.gz gnunet-815fc58842343a3b407c957e288f63718d3caebb.zip |
more logger
Diffstat (limited to 'src/integration-tests/gnunet_testing.py.in')
-rw-r--r-- | src/integration-tests/gnunet_testing.py.in | 59 |
1 files changed, 34 insertions, 25 deletions
diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in index 18e90e426..dcfc99e8d 100644 --- a/src/integration-tests/gnunet_testing.py.in +++ b/src/integration-tests/gnunet_testing.py.in | |||
@@ -256,21 +256,22 @@ class EqualStatisticsCondition(Condition): | |||
256 | fail = b"" | 256 | fail = b"" |
257 | op = b" == " | 257 | op = b" == " |
258 | if (((self.fulfilled == False) and (failed_only == True)) or (failed_only == False)): | 258 | if (((self.fulfilled == False) and (failed_only == True)) or (failed_only == False)): |
259 | print(self.peer.id[:4] + | 259 | # print(self.peer.id[:4] + |
260 | b' "' + | 260 | # b' "' + |
261 | self.subsystem.encode('utf-8').ljust(12) + | 261 | # self.subsystem.encode('utf-8').ljust(12) + |
262 | b'" "' + | 262 | # b'" "' + |
263 | self.name.encode('utf-8').ljust(30) + | 263 | # self.name.encode('utf-8').ljust(30) + |
264 | b'" == ' + | 264 | # b'" == ' + |
265 | str(self.result).encode('utf-8') + | 265 | # str(self.result).encode('utf-8') + |
266 | b" " + | 266 | # b" " + |
267 | self.peer2.id[:4] + | 267 | # self.peer2.id[:4] + |
268 | b' "' + | 268 | # b' "' + |
269 | self.subsystem2.encode('utf-8').ljust(12) + | 269 | # self.subsystem2.encode('utf-8').ljust(12) + |
270 | b'" ' + | 270 | # b'" ' + |
271 | self.name2.encode('utf-8').ljust(30) + | 271 | # self.name2.encode('utf-8').ljust(30) + |
272 | b'" ' + | 272 | # b'" ' + |
273 | str(self.result2).encode('utf-8')) | 273 | # str(self.result2).encode('utf-8')) |
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')) | ||
274 | return self.fulfilled | 275 | return self.fulfilled |
275 | 276 | ||
276 | 277 | ||
@@ -309,7 +310,8 @@ class Test(object): | |||
309 | class Peer(object): | 310 | class Peer(object): |
310 | def __init__(self, test, cfg_file): | 311 | def __init__(self, test, cfg_file): |
311 | if (False == os.path.isfile(cfg_file)): | 312 | if (False == os.path.isfile(cfg_file)): |
312 | print(("Peer cfg " + cfg_file + ": FILE NOT FOUND")) | 313 | # print(("Peer cfg " + cfg_file + ": FILE NOT FOUND")) |
314 | logger.debug('Peer cfg %s : FILE NOT FOUND', cfg_file) | ||
313 | self.id = "<NaN>" | 315 | self.id = "<NaN>" |
314 | self.test = test | 316 | self.test = test |
315 | self.started = False | 317 | self.started = False |
@@ -317,12 +319,14 @@ class Peer(object): | |||
317 | 319 | ||
318 | def __del__(self): | 320 | def __del__(self): |
319 | if (self.started == True): | 321 | if (self.started == True): |
320 | print('ERROR! Peer using cfg ' + self.cfg + ' was not stopped') | 322 | # print('ERROR! Peer using cfg ' + self.cfg + ' was not stopped') |
323 | logger.debug('ERROR! Peer using cfg %s was not stopped', self.cfg) | ||
321 | ret = self.stop() | 324 | ret = self.stop() |
322 | if (False == ret): | 325 | if (False == ret): |
323 | print('ERROR! Peer using cfg ' + | 326 | # print('ERROR! Peer using cfg ' + |
324 | self.cfg + | 327 | # self.cfg + |
325 | ' could not be stopped') | 328 | # ' could not be stopped') |
329 | logger.debug('ERROR! Peer using cfg %s could not be stopped', self.cfg) | ||
326 | self.started = False | 330 | self.started = False |
327 | return ret | 331 | return ret |
328 | else: | 332 | else: |
@@ -334,7 +338,8 @@ class Peer(object): | |||
334 | server = subprocess.Popen([self.test.gnunetarm, '-sq', '-c', self.cfg]) | 338 | server = subprocess.Popen([self.test.gnunetarm, '-sq', '-c', self.cfg]) |
335 | server.communicate() | 339 | server.communicate() |
336 | except OSError: | 340 | except OSError: |
337 | print("Can not start peer") | 341 | # print("Can not start peer") |
342 | logger.debug('Can not start peer') | ||
338 | self.started = False | 343 | self.started = False |
339 | return False | 344 | return False |
340 | self.started = True | 345 | self.started = True |
@@ -344,7 +349,8 @@ class Peer(object): | |||
344 | server.spawn(None, [self.test.gnunetpeerinfo, '-c', self.cfg, '-s'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) | 349 | server.spawn(None, [self.test.gnunetpeerinfo, '-c', self.cfg, '-s'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) |
345 | test = server.read("stdout", 1024) | 350 | test = server.read("stdout", 1024) |
346 | except OSError: | 351 | except OSError: |
347 | print("Can not get peer identity") | 352 | # print("Can not get peer identity") |
353 | logger.debug('Can not get peer identity') | ||
348 | test = (test.split(b'`')[1]) | 354 | test = (test.split(b'`')[1]) |
349 | self.id = test.split(b'\'')[0] | 355 | self.id = test.split(b'\'')[0] |
350 | return True | 356 | return True |
@@ -357,7 +363,8 @@ class Peer(object): | |||
357 | server = subprocess.Popen([self.test.gnunetarm, '-eq', '-c', self.cfg]) | 363 | server = subprocess.Popen([self.test.gnunetarm, '-eq', '-c', self.cfg]) |
358 | server.communicate() | 364 | server.communicate() |
359 | except OSError: | 365 | except OSError: |
360 | print("Can not stop peer") | 366 | # print("Can not stop peer") |
367 | logger.debug('Can not stop peer') | ||
361 | return False | 368 | return False |
362 | self.started = False | 369 | self.started = False |
363 | return True | 370 | return True |
@@ -372,9 +379,11 @@ class Peer(object): | |||
372 | if os.name == 'nt' and tests[1] == b'\n' and tests[0][-1] == b'\r': | 379 | if os.name == 'nt' and tests[1] == b'\n' and tests[0][-1] == b'\r': |
373 | tests = (tests[0][:-1], tests[1], tests[2]) | 380 | tests = (tests[0][:-1], tests[1], tests[2]) |
374 | tests = tests[0] | 381 | tests = tests[0] |
375 | print("running gnunet-statistics " + self.cfg + " for " + name + "/" + subsystem + " yields " + tests.decode("utf-8")) | 382 | # 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")) | ||
376 | if (tests.isdigit() == True): | 384 | if (tests.isdigit() == True): |
377 | return tests | 385 | return tests |
378 | else: | 386 | else: |
379 | print("Invalid statistics value: " + str(tests) + " is not a number!") | 387 | # print("Invalid statistics value: " + str(tests) + " is not a number!") |
388 | logger.debug('Invalid statistics value: %s is not a number!', str(tests)) | ||
380 | return -1 | 389 | return -1 |