[GNUnet-SVN] r19823 - gnunet/src/integration-tests

[gnunet]

Author: wachs
Date: 2012-02-16 17:28:47 +0100 (Thu, 16 Feb 2012)
New Revision: 19823

Modified:
   gnunet/src/integration-tests/gnunet_testing.py.in
Log:
- peer id in statistics


Modified: gnunet/src/integration-tests/gnunet_testing.py.in
===================================================================
--- gnunet/src/integration-tests/gnunet_testing.py.in   2012-02-16 16:18:20 UTC 
(rev 19822)
+++ gnunet/src/integration-tests/gnunet_testing.py.in   2012-02-16 16:28:47 UTC 
(rev 19823)
@@ -135,9 +135,9 @@
             fail = ""
             op = " == "
         if ((self.fulfilled == False) and (failed_only == True)):
-            print self.peer.cfg + " " + str(self.type) + ' condition in 
subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : 
(expected/real value) ' + str(self.value) + op + res + fail
+            print self.peer.id[:4] + " " +self.peer.cfg + " " +  
str(self.type) + ' condition in subsystem "' + self.subsystem.ljust(12) +'" : 
"' + self.name.ljust(30) +'" : (expected/real value) ' + str(self.value) + op + 
res + fail
         elif (failed_only == False): 
-            print self.peer.cfg + " " + str(self.type) + ' condition in 
subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : 
(expected/real value) ' + str(self.value) + op + res + fail 
+            print self.peer.id[:4] + " " +self.peer.cfg + " " +  
str(self.type) + ' condition in subsystem "' + self.subsystem.ljust(12) +'" : 
"' + self.name.ljust(30) +'" : (expected/real value) ' + str(self.value) + op + 
res + fail 
         return self.fulfilled    
         
 class Test:
@@ -173,7 +173,7 @@
     def __init__(self, test, cfg_file):
         if (False == os.path.isfile(cfg_file)):
             print ("Peer cfg " + cfg_file + ": FILE NOT FOUND")
-        self.id = ""
+        self.id = "<NaN>"
         self.test = test
         self.started = False
         self.cfg = cfg_file