diff options
| author | John Newbery <john@johnnewbery.com> | 2017-03-29 11:37:00 -0400 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2017-03-30 08:39:12 -0400 |
| commit | 6a18bb9a3603839160dd77b671d5f59d12bd2666 (patch) | |
| tree | 922efd5af9afe0ea440d5e1d949eea6253ba29dd /test/functional/test_framework/mininode.py | |
| parent | 6426716a9940eea0e4d6e53c55282de5de473784 (diff) | |
| download | bitcoin-6a18bb9a3603839160dd77b671d5f59d12bd2666.tar.xz | |
[tests] sync_with_ping should assert that ping hasn't timed out
sync_with_ping currently returns false if the timeout expires, and it is
the caller's responsibility to fail the test. However, none of the tests
currently assert on sync_with_ping()'s return code. This commit adds an
assert to sync_with_ping so the test will fail if the timeout expires.
This commit also removes all the duplicate implementations of
sync_with_ping() from the individual tests.
Diffstat (limited to 'test/functional/test_framework/mininode.py')
| -rwxr-xr-x | test/functional/test_framework/mininode.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/functional/test_framework/mininode.py b/test/functional/test_framework/mininode.py index b02ffbe14a..ebb846a237 100755 --- a/test/functional/test_framework/mininode.py +++ b/test/functional/test_framework/mininode.py @@ -1563,11 +1563,14 @@ class NodeConnCB(object): self.sync_with_ping() # Sync up with the node - def sync_with_ping(self, timeout=30): + def sync_with_ping(self, timeout=60): def received_pong(): return (self.last_pong.nonce == self.ping_counter) self.send_message(msg_ping(nonce=self.ping_counter)) success = wait_until(received_pong, timeout=timeout) + if not success: + logger.error("sync_with_ping failed!") + raise AssertionError("sync_with_ping failed!") self.ping_counter += 1 return success |