diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-02-19 00:35:44 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-02-19 00:35:44 +0100 |
commit | e7857ff6408f917a2ca57185def5596274569e11 (patch) | |
tree | 5958e7a60991a46a5a35c58dd862325a59d9dbb1 /src/integration-tests | |
parent | 0ca5d7e2a0d80732fcab9422281da7b80964da6b (diff) | |
download | gnunet-e7857ff6408f917a2ca57185def5596274569e11.tar.gz gnunet-e7857ff6408f917a2ca57185def5596274569e11.zip |
cleaner py code, fix test_integration_disconnect.py.in by fixing erroneous patch
Diffstat (limited to 'src/integration-tests')
-rw-r--r-- | src/integration-tests/gnunet_testing.py.in | 12 | ||||
-rwxr-xr-x | src/integration-tests/test_integration_disconnect.py.in | 22 |
2 files changed, 16 insertions, 18 deletions
diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in index 5767a455a..639776fe0 100644 --- a/src/integration-tests/gnunet_testing.py.in +++ b/src/integration-tests/gnunet_testing.py.in | |||
@@ -170,13 +170,13 @@ class StatisticsCondition(Condition): | |||
170 | self.peer = peer | 170 | self.peer = peer |
171 | self.subsystem = subsystem | 171 | self.subsystem = subsystem |
172 | self.name = name | 172 | self.name = name |
173 | self.value = value | 173 | self.value = str(value) |
174 | self.result = -1 | 174 | self.result = -1 |
175 | 175 | ||
176 | def check(self): | 176 | def check(self): |
177 | if (self.fulfilled == False): | 177 | if (self.fulfilled == False): |
178 | self.result = self.peer.get_statistics_value(self.subsystem, self.name) | 178 | self.result = self.peer.get_statistics_value(self.subsystem, self.name) |
179 | if (self.result == str(self.value)): | 179 | if (self.result == self.value): |
180 | self.fulfilled = True | 180 | self.fulfilled = True |
181 | return True | 181 | return True |
182 | else: | 182 | else: |
@@ -206,7 +206,7 @@ class StatisticsCondition(Condition): | |||
206 | # op + | 206 | # op + |
207 | # res + | 207 | # res + |
208 | # fail) | 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.encode('utf-8'), str(self.type).encode('utf-8'), self.subsystem.encode('utf-8').ljust(12), self.name.encode('utf-8').ljust(30), str(self.value).encode('utf-8'), op, self.result, 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 | 210 | return self.fulfilled |
211 | 211 | ||
212 | 212 | ||
@@ -267,7 +267,7 @@ class EqualStatisticsCondition(Condition): | |||
267 | # self.name2.encode('utf-8').ljust(30) + | 267 | # self.name2.encode('utf-8').ljust(30) + |
268 | # b'" ' + | 268 | # b'" ' + |
269 | # self.result2) | 269 | # self.result2) |
270 | logger.debug('%s %s %s == %s %s %s %s %s', self.peer.id[:4], self.subsystem.encode('utf-8').ljust(12), self.name.encode('utf-8').ljust(30), self.result, self.peer2.id[:4], self.subsystem2.encode('uft-8').ljust(12), self.name2.encode('utf-8').ljust(30), 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) |
271 | return self.fulfilled | 271 | return self.fulfilled |
272 | 272 | ||
273 | 273 | ||
@@ -375,12 +375,10 @@ class Peer(object): | |||
375 | if os.name == 'nt' and tests[1] == b'\n' and tests[0][-1] == b'\r': | 375 | if os.name == 'nt' and tests[1] == b'\n' and tests[0][-1] == b'\r': |
376 | tests = (tests[0][:-1], tests[1], tests[2]) | 376 | tests = (tests[0][:-1], tests[1], tests[2]) |
377 | tests = tests[0] | 377 | tests = tests[0] |
378 | # print("running gnunet-statistics " + self.cfg + " for " + name + "/" + subsystem + " yields " + tests.decode("utf-8")) | ||
379 | logger.debug('running gnunet-statistics %s for %s "/" %s yields %s', self.cfg, name, subsystem, test.decode("utf-8")) | ||
380 | result = tests.decode("utf-8").strip() | 378 | result = tests.decode("utf-8").strip() |
379 | logger.debug('running gnunet-statistics %s for %s "/" %s yields %s', self.cfg, name, subsystem, result) | ||
381 | if (result.isdigit() == True): | 380 | if (result.isdigit() == True): |
382 | return result | 381 | return result |
383 | else: | 382 | else: |
384 | # print("Invalid statistics value: " + str(tests) + " is not a number!") | ||
385 | logger.debug('Invalid statistics value: %s is not a number!', result) | 383 | logger.debug('Invalid statistics value: %s is not a number!', result) |
386 | return -1 | 384 | return -1 |
diff --git a/src/integration-tests/test_integration_disconnect.py.in b/src/integration-tests/test_integration_disconnect.py.in index e1e431a0a..a81c78540 100755 --- a/src/integration-tests/test_integration_disconnect.py.in +++ b/src/integration-tests/test_integration_disconnect.py.in | |||
@@ -108,17 +108,17 @@ def fail_connect_cont (check): | |||
108 | 108 | ||
109 | def check_connect (): | 109 | def check_connect (): |
110 | check = Check (test) | 110 | check = Check (test) |
111 | check.add (StatisticsCondition (client, 'transport', '# peers connected',2)) | 111 | check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) |
112 | check.add (StatisticsCondition (client, 'core', '# peers connected',2)) | 112 | check.add (StatisticsCondition (server, 'core', '# peers connected',1)) |
113 | check.add (StatisticsCondition (client, 'topology', '# peers connected',2)) | 113 | check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) |
114 | check.add (StatisticsCondition (client, 'dht', '# peers connected',2)) | 114 | check.add (StatisticsCondition (server, 'dht', '# peers connected',1)) |
115 | check.add (StatisticsCondition (client, 'fs', '# peers connected',2)) | 115 | check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) |
116 | 116 | ||
117 | check.add (StatisticsCondition (server, 'transport', '# peers connected',2)) | 117 | check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) |
118 | check.add (StatisticsCondition (server, 'core', '# peers connected',2)) | 118 | check.add (StatisticsCondition (client, 'core', '# peers connected',1)) |
119 | check.add (StatisticsCondition (server, 'topology', '# peers connected',2)) | 119 | check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) |
120 | check.add (StatisticsCondition (server, 'dht', '# peers connected',2)) | 120 | check.add (StatisticsCondition (client, 'dht', '# peers connected',1)) |
121 | check.add (StatisticsCondition (server, 'fs', '# peers connected',2)) | 121 | check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) |
122 | 122 | ||
123 | check.run_blocking (check_timeout, success_connect_cont, fail_connect_cont) | 123 | check.run_blocking (check_timeout, success_connect_cont, fail_connect_cont) |
124 | 124 | ||