[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20879 - gnunet/src/integration-tests
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20879 - gnunet/src/integration-tests |
Date: |
Tue, 3 Apr 2012 15:22:45 +0200 |
Author: wachs
Date: 2012-04-03 15:22:45 +0200 (Tue, 03 Apr 2012)
New Revision: 20879
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:08:07 UTC
(rev 20878)
+++ gnunet/src/integration-tests/gnunet_testing.py.in 2012-04-03 13:22:45 UTC
(rev 20879)
@@ -42,7 +42,6 @@
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 @@
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 @@
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
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:08:07 UTC (rev 20878)
+++ gnunet/src/integration-tests/test_integration_connection_value.py.in
2012-04-03 13:22:45 UTC (rev 20879)
@@ -65,17 +65,19 @@
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
#
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20879 - gnunet/src/integration-tests,
gnunet <=