aboutsummaryrefslogtreecommitdiff
path: root/src/integration-tests/gnunet_testing.py.in
diff options
context:
space:
mode:
Diffstat (limited to 'src/integration-tests/gnunet_testing.py.in')
-rw-r--r--src/integration-tests/gnunet_testing.py.in28
1 files changed, 20 insertions, 8 deletions
diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in
index 4b667a270..81dff3f06 100644
--- a/src/integration-tests/gnunet_testing.py.in
+++ b/src/integration-tests/gnunet_testing.py.in
@@ -67,8 +67,6 @@ class Check:
67 print (str(pos) +' out of '+ str (pos+neg) + ' conditions fulfilled') 67 print (str(pos) +' out of '+ str (pos+neg) + ' conditions fulfilled')
68 return self.fulfilled 68 return self.fulfilled
69 69
70
71
72class Condition: 70class Condition:
73 def __init__(self): 71 def __init__(self):
74 self.fulfilled = False 72 self.fulfilled = False
@@ -115,10 +113,11 @@ class StatisticsCondition (Condition):
115 self.subsystem = subsystem; 113 self.subsystem = subsystem;
116 self.name = name; 114 self.name = name;
117 self.value = value; 115 self.value = value;
116 self.result = -1;
118 def check(self): 117 def check(self):
119 if (self.fulfilled == False): 118 if (self.fulfilled == False):
120 res = self.peer.check (self.subsystem, self.name, self.value); 119 self.result = self.peer.check (self.subsystem, self.name, self.value);
121 if (res == True): 120 if (self.result == self.value):
122 self.fulfilled = True 121 self.fulfilled = True
123 return True 122 return True
124 else: 123 else:
@@ -127,9 +126,21 @@ class StatisticsCondition (Condition):
127 return True 126 return True
128 def eval(self, failed_only): 127 def eval(self, failed_only):
129 if ((self.fulfilled == False) and (failed_only == True)): 128 if ((self.fulfilled == False) and (failed_only == True)):
130 print str(self.type) + ' condition for value "'+str(self.value)+'" in subsystem "' + self.subsystem +'" : "' + self.name +'" was ' + str(self.fulfilled) 129 if (self.fulfilled == False):
130 fail = " FAIL!"
131 op = " != "
132 else:
133 fail = ""
134 op = " == "
135 print self.peer.cfg + " " + str(self.type) + ' condition in subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : ' + str(self.value) + op + str(self.result) + fail
131 elif (failed_only == False): 136 elif (failed_only == False):
132 print str(self.type) + ' condition for value "'+str(self.value)+'" in subsystem "' + self.subsystem +'" : "' + self.name +'" was ' + str(self.fulfilled) 137 if (self.fulfilled == False):
138 fail = " FAIL!"
139 op = " != "
140 else:
141 fail = ""
142 op = " == "
143 print self.peer.cfg + " " + str(self.type) + ' condition in subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : ' + str(self.value) + op + str(self.result) + fail
133 return self.fulfilled 144 return self.fulfilled
134 145
135class Test: 146class Test:
@@ -206,7 +217,8 @@ class Peer:
206 #server.expect ("stdout", re.compile (r"")) 217 #server.expect ("stdout", re.compile (r""))
207 test = server.read("stdout", 10240) 218 test = server.read("stdout", 10240)
208 if (test.find(str(value)) == -1): 219 if (test.find(str(value)) == -1):
209 return False 220 return value
210 else: 221 else:
211 return True 222 return value
223
212 \ No newline at end of file 224 \ No newline at end of file