aboutsummaryrefslogtreecommitdiff
path: root/test/functional/p2p-mempool.py
diff options
context:
space:
mode:
authorJohn Newbery <john@johnnewbery.com>2017-03-29 11:37:00 -0400
committerJohn Newbery <john@johnnewbery.com>2017-03-30 08:39:12 -0400
commit6a18bb9a3603839160dd77b671d5f59d12bd2666 (patch)
tree922efd5af9afe0ea440d5e1d949eea6253ba29dd /test/functional/p2p-mempool.py
parent6426716a9940eea0e4d6e53c55282de5de473784 (diff)
[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/p2p-mempool.py')
-rwxr-xr-xtest/functional/p2p-mempool.py9
1 files changed, 0 insertions, 9 deletions
diff --git a/test/functional/p2p-mempool.py b/test/functional/p2p-mempool.py
index 3d3a9939d4..5064ce74aa 100755
--- a/test/functional/p2p-mempool.py
+++ b/test/functional/p2p-mempool.py
@@ -62,15 +62,6 @@ class TestNode(NodeConnCB):
def on_close(self, conn):
self.peer_disconnected = True
- # Sync up with the node after delivery of a block
- def sync_with_ping(self, timeout=30):
- def received_pong():
- return (self.last_pong.nonce == self.ping_counter)
- self.connection.send_message(msg_ping(nonce=self.ping_counter))
- success = wait_until(received_pong, timeout=timeout)
- self.ping_counter += 1
- return success
-
def send_mempool(self):
self.lastInv = []
self.send_message(msg_mempool())