Merge branch 'master' of git+ssh://gnunet.org/gnunet

1 files changed, 77 insertions, 53 deletions

diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in
index 1470c3d38..dcfc99e8d 100644
--- a/src/integration-tests/gnunet_testing.py.in
+++ b/src/integration-tests/gnunet_testing.py.in
@@ -28,7 +28,15 @@ import sys
 import shutil
 import time
 from gnunet_pyexpect import pexpect
+import logging
 
+logger = logging.getLogger()
+handler = logging.StreamHandler()
+formatter = logging.Formatter(
+        '%(asctime)s %(name)-12s %(levelname)-8s %(message)s')
+handler.setFormatter(formatter)
+logger.addHandler(handler)
+logger.setLevel(logging.DEBUG)
 
 class Check(object):
     def __init__(self, test):
@@ -59,7 +67,8 @@ class Check(object):
             time.sleep(1)
             execs += 1
         if ((False == res) and (execs >= timeout)):
-            print(('Check had timeout after ' + str(timeout) + ' seconds'))
+            logger.debug('Check had timeout after %s seconds', str(timeout))
+            # print(('Check had timeout after ' + str(timeout) + ' seconds'))
             neg_cont(self)
         elif ((False == res) and (execs < timeout)):
             if (None != neg_cont):
@@ -87,7 +96,8 @@ class Check(object):
                 neg += 1
             else:
                 pos += 1
-        print((str(pos) + ' out of ' + str(pos+neg) + ' conditions fulfilled'))
+        # print((str(pos) + ' out of ' + str(pos+neg) + ' conditions fulfilled'))
+        logger.debug('%s out of %s conditions fulfilled', str(pos), str(pos+neg))
         return self.fulfilled
 
     def reset(self):
@@ -110,9 +120,11 @@ class Condition(object):
 
     def evaluate(self, failed_only):
         if ((self.fulfilled == False) and (failed_only == True)):
-            print(str(self.type) + 'condition for was ' + str(self.fulfilled))
+            # print(str(self.type) + 'condition for was ' + str(self.fulfilled))
+            logger.debug('%s condition for was %s', str(self.type), str(self.fulfilled))
         elif (failed_only == False):
-            print(str(self.type) + 'condition for was ' + str(self.fulfilled))
+            # print(str(self.type) + 'condition for was ' + str(self.fulfilled))
+            logger.debug('%s condition for was %s', str(self.type), str(self.fulfilled))
         return self.fulfilled
 
 
@@ -135,17 +147,19 @@ class FileExistCondition(Condition):
 
     def evaluate(self, failed_only):
         if ((self.fulfilled == False) and (failed_only == True)):
-            print(str(self.type) +
-                  'condition for file ' +
-                  self.file +
-                  ' was ' +
-                  str(self.fulfilled))
+            # print(str(self.type) +
+            #      'condition for file ' +
+            #      self.file +
+            #      ' was ' +
+            #      str(self.fulfilled))
+            logger.debug('%s confition for file %s was %s', str(self.type), self.file, str(self.fulfilled))
         elif (failed_only == False):
-            print(str(self.type) +
-                  'condition for file ' +
-                  self.file +
-                  ' was ' +
-                  str(self.fulfilled))
+            # print(str(self.type) +
+            #      'condition for file ' +
+            #      self.file +
+            #      ' was ' +
+            #      str(self.fulfilled))
+            logger.debug('%s confition for file %s was %s', str(self.type), self.file, str(self.fulfilled))
         return self.fulfilled
 
 
@@ -182,20 +196,21 @@ class StatisticsCondition(Condition):
             fail = b""
             op = b" == "
         if (((self.fulfilled == False) and (failed_only == True)) or (failed_only == False)):
-            print(self.peer.id[:4] +
-                  b" " +
-                  self.peer.cfg.encode('utf-8') +
-                  b" " +
-                  str(self.type).encode('utf-8') +
-                  b' condition in subsystem "' +
-                  self.subsystem.encode('utf-8').ljust(12) +
-                  b'" : "' +
-                  self.name.encode('utf-8').ljust(30) +
-                  b'" : (expected/real value) ' +
-                  str(self.value).encode('utf-8') +
-                  op +
-                  res +
-                  fail)
+            # print(self.peer.id[:4] +
+            #       b" " +
+            #       self.peer.cfg.encode('utf-8') +
+            #       b" " +
+            #       str(self.type).encode('utf-8') +
+            #       b' condition in subsystem "' +
+            #       self.subsystem.encode('utf-8').ljust(12) +
+            #       b'" : "' +
+            #       self.name.encode('utf-8').ljust(30) +
+            #       b'" : (expected/real value) ' +
+            #       str(self.value).encode('utf-8') +
+            #       op +
+            #       res +
+            #       fail)
+            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)
         return self.fulfilled
 
 
@@ -241,21 +256,22 @@ class EqualStatisticsCondition(Condition):
             fail = b""
             op = b" == "
         if (((self.fulfilled == False) and (failed_only == True)) or (failed_only == False)):
-            print(self.peer.id[:4] +
-                  b' "' +
-                  self.subsystem.encode('utf-8').ljust(12) +
-                  b'" "' +
-                  self.name.encode('utf-8').ljust(30) +
-                  b'" == ' +
-                  str(self.result).encode('utf-8') +
-                  b" " +
-                  self.peer2.id[:4] +
-                  b' "' +
-                  self.subsystem2.encode('utf-8').ljust(12) +
-                  b'" ' +
-                  self.name2.encode('utf-8').ljust(30) +
-                  b'" ' +
-                  str(self.result2).encode('utf-8'))
+            # print(self.peer.id[:4] +
+            #       b' "' +
+            #       self.subsystem.encode('utf-8').ljust(12) +
+            #       b'" "' +
+            #       self.name.encode('utf-8').ljust(30) +
+            #       b'" == ' +
+            #       str(self.result).encode('utf-8') +
+            #       b" " +
+            #       self.peer2.id[:4] +
+            #       b' "' +
+            #       self.subsystem2.encode('utf-8').ljust(12) +
+            #       b'" ' +
+            #       self.name2.encode('utf-8').ljust(30) +
+            #       b'" ' +
+            #       str(self.result2).encode('utf-8'))
+            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'))
         return self.fulfilled
 
 
@@ -294,7 +310,8 @@ class Test(object):
 class Peer(object):
     def __init__(self, test, cfg_file):
         if (False == os.path.isfile(cfg_file)):
-            print(("Peer cfg " + cfg_file + ": FILE NOT FOUND"))
+            # print(("Peer cfg " + cfg_file + ": FILE NOT FOUND"))
+            logger.debug('Peer cfg %s : FILE NOT FOUND', cfg_file)
         self.id = "<NaN>"
         self.test = test
         self.started = False
@@ -302,12 +319,14 @@ class Peer(object):
 
     def __del__(self):
         if (self.started == True):
-            print('ERROR! Peer using cfg ' + self.cfg + ' was not stopped')
+            # print('ERROR! Peer using cfg ' + self.cfg + ' was not stopped')
+            logger.debug('ERROR! Peer using cfg %s was not stopped', self.cfg)
             ret = self.stop()
             if (False == ret):
-                print('ERROR! Peer using cfg ' +
-                      self.cfg +
-                      ' could not be stopped')
+                # print('ERROR! Peer using cfg ' +
+                #       self.cfg +
+                #       ' could not be stopped')
+                logger.debug('ERROR! Peer using cfg %s could not be stopped', self.cfg)
                 self.started = False
             return ret
         else:
@@ -319,7 +338,8 @@ class Peer(object):
             server = subprocess.Popen([self.test.gnunetarm, '-sq', '-c', self.cfg])
             server.communicate()
         except OSError:
-            print("Can not start peer")
+            # print("Can not start peer")
+            logger.debug('Can not start peer')
             self.started = False
             return False
         self.started = True
@@ -329,7 +349,8 @@ class Peer(object):
             server.spawn(None, [self.test.gnunetpeerinfo, '-c', self.cfg, '-s'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
             test = server.read("stdout", 1024)
         except OSError:
-            print("Can not get peer identity")
+            # print("Can not get peer identity")
+            logger.debug('Can not get peer identity')
         test = (test.split(b'`')[1])
         self.id = test.split(b'\'')[0]
         return True
@@ -342,7 +363,8 @@ class Peer(object):
             server = subprocess.Popen([self.test.gnunetarm, '-eq', '-c', self.cfg])
             server.communicate()
         except OSError:
-            print("Can not stop peer")
+            # print("Can not stop peer")
+            logger.debug('Can not stop peer')
             return False
         self.started = False
         return True
@@ -357,9 +379,11 @@ class Peer(object):
         if os.name == 'nt' and tests[1] == b'\n' and tests[0][-1] == b'\r':
             tests = (tests[0][:-1], tests[1], tests[2])
         tests = tests[0]
-        print("running gnunet-statistics " + self.cfg + " for " + name + "/" + subsystem + " yields " + tests.decode("utf-8"))
+        # print("running gnunet-statistics " + self.cfg + " for " + name + "/" + subsystem + " yields " + tests.decode("utf-8"))
+        logger.debug('running gnunet-statistics %s for %s "/" %s yields %s', self.cfg, name, subsystem, test.decode("utf-8"))
         if (tests.isdigit() == True):
             return tests
         else:
-            print("Invalid statistics value: " + str(tests) + " is not a number!")
+            # print("Invalid statistics value: " + str(tests) + " is not a number!")
+            logger.debug('Invalid statistics value: %s is not a number!', str(tests))
             return -1