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

[gnunet]

Author: wachs
Date: 2012-04-03 15:06:59 +0200 (Tue, 03 Apr 2012)
New Revision: 20877

Modified:
   gnunet/src/integration-tests/gnunet_testing.py.in
   gnunet/src/integration-tests/test_integration_connection_value.py.in
Log:
- changes


Modified: gnunet/src/integration-tests/gnunet_testing.py.in
===================================================================
--- gnunet/src/integration-tests/gnunet_testing.py.in   2012-04-03 13:01:03 UTC 
(rev 20876)
+++ gnunet/src/integration-tests/gnunet_testing.py.in   2012-04-03 13:06:59 UTC 
(rev 20877)
@@ -190,10 +190,10 @@
             fail = ""
             op = " == "
         if ((self.fulfilled == False) and (failed_only == True)):
-            print self.peer.id[:4] + " "  + self.subsystem.ljust(12) + " " + 
self.result +" " + self.peer2.id[:4] + " "  + self.subsystem2.ljust(12) + " " + 
self.result2 
+            print self.peer.id[:4] + " "  + self.subsystem.ljust(12) + " " + 
str(self.result) +" " + self.peer2.id[:4] + " "  + self.subsystem2.ljust(12) + 
" " + str(self.result2) 
             #print self.peer.id[:4] + " " + 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.id[:4] + " "  + self.subsystem.ljust(12) + " " + 
self.result +" " + self.peer2.id[:4] + " "  + self.subsystem2.ljust(12) + " " + 
self.result2 
+            print self.peer.id[:4] + " "  + self.subsystem.ljust(12) + " " + 
str(self.result) +" " + self.peer2.id[:4] + " "  + self.subsystem2.ljust(12) + 
" " + str(self.result2) 
         return self.fulfilled                    
         
 class Test:

Modified: gnunet/src/integration-tests/test_integration_connection_value.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_connection_value.py.in        
2012-04-03 13:01:03 UTC (rev 20876)
+++ gnunet/src/integration-tests/test_integration_connection_value.py.in        
2012-04-03 13:06:59 UTC (rev 20877)
@@ -47,10 +47,9 @@
 
 def cleanup ():
        if os.name == "nt":
-           shutil.rmtree (os.path.join (os.getenv ("TEMP"), 
"gnunet-test-fs-py-ns"), True)
-           shutil.rmtree (os.path.join (os.getenv ("TEMP"), 
"c_no_nat_client"), True)
+           shutil.rmtree (os.path.join (os.getenv ("TEMP"), 
"c_normal_client"), True)
        else:
-           shutil.rmtree ("/tmp/c_no_nat_client/", True)
+           shutil.rmtree ("/tmp/c_normal_client/", True)
 
 
 def success_cont (check):
@@ -66,13 +65,17 @@
 def check_connect ():
   check = Check (test)
   check.add (EqualStatisticsCondition (client, 'transport', '# peers 
connected', client,  'core', '# neighbour entries allocated'))
+  #check.add (EqualStatisticsCondition (client, 'transport', '# peers 
connected', client,  'core', '# entries in session map'))
+  #check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries 
allocated', client,  'core', '# entries in session map'))
   
-#  while True ==  check.run_once (check_timeout, None, None):
-#      print "Yes"
+  while True:
+       res = check.run_once (None, None)
+       print "Values are equal"
+       check.evaluate (False)
+       if (False == res):
+               break
+       time.sleep (1)
        
-  res = check.run_once (None, None)
-  print "RES " + str(res)
-
 # 
 # Test execution
 # 
@@ -86,7 +89,7 @@
        
        test = Test ('test_integration_connection_value', verbose)
        
-       client = Peer(test, './confs/c_no_nat_client.conf');
+       client = Peer(test, './confs/c_normal_client.conf');
        client.start();
        
        if (client.started == True):
@@ -108,9 +111,7 @@
     run ()
 except (KeyboardInterrupt, SystemExit):    
     print 'Test interrupted'
-    server.stop ()
     client.stop ()
-    client2.stop ()
     cleanup ()
 if (success == False):
        sys.exit(1)