diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-02-19 00:49:26 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-02-19 00:49:26 +0100 |
commit | ff2452d5502f0798b6ae6e51bd9d9265616bbda4 (patch) | |
tree | f57e1195457b373b9ffaed3db2240d5a46a1dcf2 /src/integration-tests/gnunet_testing.py.in | |
parent | e7857ff6408f917a2ca57185def5596274569e11 (diff) | |
download | gnunet-ff2452d5502f0798b6ae6e51bd9d9265616bbda4.tar.gz gnunet-ff2452d5502f0798b6ae6e51bd9d9265616bbda4.zip |
clean up python logic a bit, remove duplicate print() calls when we have log calls
Diffstat (limited to 'src/integration-tests/gnunet_testing.py.in')
-rw-r--r-- | src/integration-tests/gnunet_testing.py.in | 67 |
1 files changed, 5 insertions, 62 deletions
diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in index 639776fe0..75fffb1ab 100644 --- a/src/integration-tests/gnunet_testing.py.in +++ b/src/integration-tests/gnunet_testing.py.in | |||
@@ -68,7 +68,6 @@ class Check(object): | |||
68 | execs += 1 | 68 | execs += 1 |
69 | if ((False == res) and (execs >= timeout)): | 69 | if ((False == res) and (execs >= timeout)): |
70 | logger.debug('Check had timeout after %s seconds', str(timeout)) | 70 | logger.debug('Check had timeout after %s seconds', str(timeout)) |
71 | # print(('Check had timeout after ' + str(timeout) + ' seconds')) | ||
72 | neg_cont(self) | 71 | neg_cont(self) |
73 | elif ((False == res) and (execs < timeout)): | 72 | elif ((False == res) and (execs < timeout)): |
74 | if (None != neg_cont): | 73 | if (None != neg_cont): |
@@ -96,7 +95,6 @@ class Check(object): | |||
96 | neg += 1 | 95 | neg += 1 |
97 | else: | 96 | else: |
98 | pos += 1 | 97 | pos += 1 |
99 | # print((str(pos) + ' out of ' + str(pos+neg) + ' conditions fulfilled')) | ||
100 | logger.debug('%s out of %s conditions fulfilled', str(pos), str(pos+neg)) | 98 | logger.debug('%s out of %s conditions fulfilled', str(pos), str(pos+neg)) |
101 | return self.fulfilled | 99 | return self.fulfilled |
102 | 100 | ||
@@ -120,10 +118,8 @@ class Condition(object): | |||
120 | 118 | ||
121 | def evaluate(self, failed_only): | 119 | def evaluate(self, failed_only): |
122 | if ((self.fulfilled == False) and (failed_only == True)): | 120 | if ((self.fulfilled == False) and (failed_only == True)): |
123 | # print(str(self.type) + 'condition for was ' + str(self.fulfilled)) | ||
124 | logger.debug('%s condition for was %s', str(self.type), str(self.fulfilled)) | 121 | logger.debug('%s condition for was %s', str(self.type), str(self.fulfilled)) |
125 | elif (failed_only == False): | 122 | elif (failed_only == False): |
126 | # print(str(self.type) + 'condition for was ' + str(self.fulfilled)) | ||
127 | logger.debug('%s condition for was %s', str(self.type), str(self.fulfilled)) | 123 | logger.debug('%s condition for was %s', str(self.type), str(self.fulfilled)) |
128 | return self.fulfilled | 124 | return self.fulfilled |
129 | 125 | ||
@@ -147,18 +143,8 @@ class FileExistCondition(Condition): | |||
147 | 143 | ||
148 | def evaluate(self, failed_only): | 144 | def evaluate(self, failed_only): |
149 | if ((self.fulfilled == False) and (failed_only == True)): | 145 | if ((self.fulfilled == False) and (failed_only == True)): |
150 | # print(str(self.type) + | ||
151 | # 'condition for file ' + | ||
152 | # self.file + | ||
153 | # ' was ' + | ||
154 | # str(self.fulfilled)) | ||
155 | logger.debug('%s confition for file %s was %s', str(self.type), self.file, str(self.fulfilled)) | 146 | logger.debug('%s confition for file %s was %s', str(self.type), self.file, str(self.fulfilled)) |
156 | elif (failed_only == False): | 147 | elif (failed_only == False): |
157 | # print(str(self.type) + | ||
158 | # 'condition for file ' + | ||
159 | # self.file + | ||
160 | # ' was ' + | ||
161 | # str(self.fulfilled)) | ||
162 | logger.debug('%s confition for file %s was %s', str(self.type), self.file, str(self.fulfilled)) | 148 | logger.debug('%s confition for file %s was %s', str(self.type), self.file, str(self.fulfilled)) |
163 | return self.fulfilled | 149 | return self.fulfilled |
164 | 150 | ||
@@ -186,27 +172,13 @@ class StatisticsCondition(Condition): | |||
186 | 172 | ||
187 | def evaluate(self, failed_only): | 173 | def evaluate(self, failed_only): |
188 | if (self.fulfilled == False): | 174 | if (self.fulfilled == False): |
189 | fail = b" FAIL!" | 175 | fail = " FAIL!" |
190 | op = b" != " | 176 | op = " != " |
191 | else: | 177 | else: |
192 | fail = b"" | 178 | fail = "" |
193 | op = b" == " | 179 | op = " == " |
194 | if (((self.fulfilled == False) and (failed_only == True)) or (failed_only == False)): | 180 | if (((self.fulfilled == False) and (failed_only == True)) or (failed_only == False)): |
195 | # print(self.peer.id[:4] + | 181 | logger.debug('%s %s condition in subsystem %s: %s: (expected/real value) %s %s %s %s', self.peer.id[:4].decode("utf-8"), peer.cfg, self.subsystem.ljust(12), self.name.ljust(30), self.value, op, self.result, fail) |
196 | # b" " + | ||
197 | # self.peer.cfg.encode('utf-8') + | ||
198 | # b" " + | ||
199 | # str(self.type).encode('utf-8') + | ||
200 | # b' condition in subsystem "' + | ||
201 | # self.subsystem.encode('utf-8').ljust(12) + | ||
202 | # b'" : "' + | ||
203 | # self.name.encode('utf-8').ljust(30) + | ||
204 | # b'" : (expected/real value) ' + | ||
205 | # str(self.value).encode('utf-8') + | ||
206 | # op + | ||
207 | # res + | ||
208 | # fail) | ||
209 | logger.debug('%s %s %s condition in subsystem %s : %s : (expected/real value) %s %s %s %s', self.peer.id[:4], self.peer.cfg, str(self.type), self.subsystem.ljust(12), self.name.ljust(30), self.value, op, self.result, fail) | ||
210 | return self.fulfilled | 182 | return self.fulfilled |
211 | 183 | ||
212 | 184 | ||
@@ -237,36 +209,7 @@ class EqualStatisticsCondition(Condition): | |||
237 | return True | 209 | return True |
238 | 210 | ||
239 | def evaluate(self, failed_only): | 211 | def evaluate(self, failed_only): |
240 | if (self.result == -1): | ||
241 | res = b'NaN' | ||
242 | else: | ||
243 | res = self.result | ||
244 | if (self.result2 == -1): | ||
245 | res2 = b'NaN' | ||
246 | else: | ||
247 | res2 = self.result2 | ||
248 | if (self.fulfilled == False): | ||
249 | fail = b" FAIL!" | ||
250 | op = b" != " | ||
251 | else: | ||
252 | fail = b"" | ||
253 | op = b" == " | ||
254 | if (((self.fulfilled == False) and (failed_only == True)) or (failed_only == False)): | 212 | if (((self.fulfilled == False) and (failed_only == True)) or (failed_only == False)): |
255 | # print(self.peer.id[:4] + | ||
256 | # b' "' + | ||
257 | # self.subsystem.encode('utf-8').ljust(12) + | ||
258 | # b'" "' + | ||
259 | # self.name.encode('utf-8').ljust(30) + | ||
260 | # b'" == ' + | ||
261 | # self.result + | ||
262 | # b" " + | ||
263 | # self.peer2.id[:4] + | ||
264 | # b' "' + | ||
265 | # self.subsystem2.encode('utf-8').ljust(12) + | ||
266 | # b'" ' + | ||
267 | # self.name2.encode('utf-8').ljust(30) + | ||
268 | # b'" ' + | ||
269 | # self.result2) | ||
270 | logger.debug('%s %s %s == %s %s %s %s %s', self.peer.id[:4], self.subsystem.ljust(12), self.name.ljust(30), self.result, self.peer2.id[:4], self.subsystem2.ljust(12), self.name2.ljust(30), self.result2) | 213 | logger.debug('%s %s %s == %s %s %s %s %s', self.peer.id[:4], self.subsystem.ljust(12), self.name.ljust(30), self.result, self.peer2.id[:4], self.subsystem2.ljust(12), self.name2.ljust(30), self.result2) |
271 | return self.fulfilled | 214 | return self.fulfilled |
272 | 215 | ||