- changes

diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in
index fa8af728c7a11535651622755a6dd573992b6fc2..25379724987ee8ff73aef7723f2f4064c1e0b344 100644 (file)
--- a/src/integration-tests/gnunet_testing.py.in
+++ b/src/integration-tests/gnunet_testing.py.in
@@ -42,7 +42,6 @@ class Check:
                 neg += 1
             else:
                 pos += 1
-        self.test.p (str(pos) +' out of '+ str (pos+neg) + ' conditions fulfilled')
         return fulfilled
     def run_blocking (self, timeout, pos_cont, neg_cont):
         execs = 0;
@@ -75,6 +74,10 @@ class Check:
                 pos += 1
         print (str(pos) +' out of '+ str (pos+neg) + ' conditions fulfilled')
         return self.fulfilled
+    def reset (self):
+               self.fulfilled = False     
+               for c in self.conditions:
+                       c.fulfilled = False
         
 class Condition:
     def __init__(self):
@@ -125,7 +128,7 @@ class StatisticsCondition (Condition):
         self.result = -1;
     def check(self):
         if (self.fulfilled == False):
-            self.result = self.peer.get_statistics_value (self.subsystem, self.name);
+            self.result = self.peer.get_statistics_value (self.subsystem, self.name)
             if (str(self.result) == str(self.value)):
                 self.fulfilled = True
                 return True

diff --git a/src/integration-tests/test_integration_connection_value.py.in b/src/integration-tests/test_integration_connection_value.py.in
index cb9a1378e485db6e60b06cc0249c0de4e9a672c5..29b1dfaa5460f6894da1e9e886c18decef5c6276 100755 (executable)
--- a/src/integration-tests/test_integration_connection_value.py.in
+++ b/src/integration-tests/test_integration_connection_value.py.in
@@ -65,16 +65,18 @@ def fail_cont (check):
 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'))
+  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:
-       res = check.run_once (None, None)
-       print "Values are equal"
-       check.evaluate (False)
-       if (False == res):
-               break
-       time.sleep (1)
+       time.sleep (5)
+       check.reset()
+       res = check.run_once (None, None)
+       print "Values are equal"
+       check.evaluate (False)
+#if (False == res):
+#      break
+       
        
 # 
 # Test execution