aboutsummaryrefslogtreecommitdiff
path: root/src/integration-tests/gnunet_testing.py.in
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2012-04-03 13:22:45 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2012-04-03 13:22:45 +0000
commit76eeabb0a763523d4e13be65c74165988707241e (patch)
tree45fbe6bd2f35dd83bcb32f5ecb0663cad423b556 /src/integration-tests/gnunet_testing.py.in
parent766391abef01aa3106c9abc447a07588cc4cae93 (diff)
downloadgnunet-76eeabb0a763523d4e13be65c74165988707241e.tar.gz
gnunet-76eeabb0a763523d4e13be65c74165988707241e.zip
- changes
Diffstat (limited to 'src/integration-tests/gnunet_testing.py.in')
-rw-r--r--src/integration-tests/gnunet_testing.py.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in
index fa8af728c..253797249 100644
--- a/src/integration-tests/gnunet_testing.py.in
+++ b/src/integration-tests/gnunet_testing.py.in
@@ -42,7 +42,6 @@ class Check:
42 neg += 1 42 neg += 1
43 else: 43 else:
44 pos += 1 44 pos += 1
45 self.test.p (str(pos) +' out of '+ str (pos+neg) + ' conditions fulfilled')
46 return fulfilled 45 return fulfilled
47 def run_blocking (self, timeout, pos_cont, neg_cont): 46 def run_blocking (self, timeout, pos_cont, neg_cont):
48 execs = 0; 47 execs = 0;
@@ -75,6 +74,10 @@ class Check:
75 pos += 1 74 pos += 1
76 print (str(pos) +' out of '+ str (pos+neg) + ' conditions fulfilled') 75 print (str(pos) +' out of '+ str (pos+neg) + ' conditions fulfilled')
77 return self.fulfilled 76 return self.fulfilled
77 def reset (self):
78 self.fulfilled = False
79 for c in self.conditions:
80 c.fulfilled = False
78 81
79class Condition: 82class Condition:
80 def __init__(self): 83 def __init__(self):
@@ -125,7 +128,7 @@ class StatisticsCondition (Condition):
125 self.result = -1; 128 self.result = -1;
126 def check(self): 129 def check(self):
127 if (self.fulfilled == False): 130 if (self.fulfilled == False):
128 self.result = self.peer.get_statistics_value (self.subsystem, self.name); 131 self.result = self.peer.get_statistics_value (self.subsystem, self.name)
129 if (str(self.result) == str(self.value)): 132 if (str(self.result) == str(self.value)):
130 self.fulfilled = True 133 self.fulfilled = True
131 return True 134 return True