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/assumevalid.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/assumevalid.py')
| -rwxr-xr-x | test/functional/assumevalid.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/functional/assumevalid.py b/test/functional/assumevalid.py index a9c2b17b4a..8e301c4379 100755 --- a/test/functional/assumevalid.py +++ b/test/functional/assumevalid.py @@ -190,7 +190,8 @@ class AssumeValidTest(BitcoinTestFramework): # Send all blocks to node1. All blocks will be accepted. for i in range(2202): node1.send_message(msg_block(self.blocks[i])) - node1.sync_with_ping() # make sure the most recent block is synced + # Syncing 2200 blocks can take a while on slow systems. Give it plenty of time to sync. + node1.sync_with_ping(120) assert_equal(self.nodes[1].getblock(self.nodes[1].getbestblockhash())['height'], 2202) # Send blocks to node2. Block 102 will be rejected. |