diff options
| author | fanquake <fanquake@gmail.com> | 2021-04-29 10:08:06 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-04-29 10:08:27 +0800 |
| commit | 7f37a1d560a86aa0a4397c3dcdaa974337594c00 (patch) | |
| tree | 08b6113aa49fb19e4fa6fe82b93dbb7531c7a653 /test/functional/p2p_addr_relay.py | |
| parent | 2cbb4ab7a92a281d7d7b4821654515dd59383ff3 (diff) | |
| parent | faa51ef4d33034f8c14cfd18f1c01c90883a1bb4 (diff) | |
| download | bitcoin-7f37a1d560a86aa0a4397c3dcdaa974337594c00.tar.xz | |
Merge bitcoin/bitcoin#21785: test: Fix intermittent issue in p2p_addr_relay.py
faa51ef4d33034f8c14cfd18f1c01c90883a1bb4 test: Fix intermittent issue in p2p_addr_relay.py (MarcoFalke)
fa37116c820f6a84642d57ce709a5977fd5616c4 test: Use self.send_addr_msg (MarcoFalke)
Pull request description:
Fixes https://github.com/bitcoin/bitcoin/pull/21707/files#r621048952
ACKs for top commit:
mzumsande:
ACK faa51ef4d33034f8c14cfd18f1c01c90883a1bb4
amitiuttarwar:
ACK faa51ef4d33034f8c14cfd18f1c01c90883a1bb4
Tree-SHA512: b1fbc1a4a13b020890b465083a82762981de17dd710388c651353aefc28dee23d39803c2a1dadbf88287e92598901afcb01b488115b0fecd746ab6d73775415b
Diffstat (limited to 'test/functional/p2p_addr_relay.py')
| -rwxr-xr-x | test/functional/p2p_addr_relay.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/test/functional/p2p_addr_relay.py b/test/functional/p2p_addr_relay.py index fdd02b7324..87297989ba 100755 --- a/test/functional/p2p_addr_relay.py +++ b/test/functional/p2p_addr_relay.py @@ -82,7 +82,7 @@ class AddrTest(BitcoinTestFramework): self.mocktime += 5 * 60 self.nodes[0].setmocktime(self.mocktime) for peer in receivers: - peer.sync_with_ping() + peer.sync_send_with_ping() def oversized_addr_test(self): self.log.info('Send an addr message that is too large') @@ -203,10 +203,7 @@ class AddrTest(BitcoinTestFramework): self.log.info('Check that we relay address messages') addr_source = self.nodes[0].add_p2p_connection(P2PInterface()) msg = self.setup_addr_msg(2) - addr_source.send_and_ping(msg) - self.mocktime += 5 * 60 - self.nodes[0].setmocktime(self.mocktime) - full_outbound_peer.sync_with_ping() + self.send_addr_msg(addr_source, msg, [full_outbound_peer]) assert_equal(full_outbound_peer.num_ipv4_received, 2) self.nodes[0].disconnect_p2ps() |