Skip to content

Commit f4049ea

Browse files
committed
Merge bitcoin/bitcoin#28671: test: Fix failing time check in rpc_net.py
fa4c683 test: Fix failing time check in rpc_net.py (MarcoFalke) Pull request description: This check fails on slow runners, such as s390x qemu. Fix it by using mocktime. See bitcoin/bitcoin#28523 (comment) ACKs for top commit: 0xB10C: ACK fa4c683 pinheadmz: ACK fa4c683 brunoerg: crACK fa4c683 Tree-SHA512: 83fb534682e11e97537dc89de8c16f206f38af1a892a2d5970c02684c05eaea8fc9adba3159f16b2440ca0b3871d513a0562a6f3a38f19a5574a47be0919e42f
2 parents 655dc71 + fa4c683 commit f4049ea

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

test/functional/rpc_net.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python3
2-
# Copyright (c) 2017-2022 The Bitcoin Core developers
2+
# Copyright (c) 2017-present The Bitcoin Core developers
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
55
"""Test RPC calls related to net.
@@ -315,9 +315,11 @@ def test_addpeeraddress(self):
315315

316316
self.log.debug("Test that adding an address with invalid port fails")
317317
assert_raises_rpc_error(-1, "JSON integer out of range", self.nodes[0].addpeeraddress, address="1.2.3.4", port=-1)
318-
assert_raises_rpc_error(-1, "JSON integer out of range", self.nodes[0].addpeeraddress,address="1.2.3.4", port=65536)
318+
assert_raises_rpc_error(-1, "JSON integer out of range", self.nodes[0].addpeeraddress, address="1.2.3.4", port=65536)
319319

320320
self.log.debug("Test that adding a valid address to the tried table succeeds")
321+
self.addr_time = int(time.time())
322+
node.setmocktime(self.addr_time)
321323
assert_equal(node.addpeeraddress(address="1.2.3.4", tried=True, port=8333), {"success": True})
322324
with node.assert_debug_log(expected_msgs=["CheckAddrman: new 0, tried 1, total 1 started"]):
323325
addrs = node.getnodeaddresses(count=0) # getnodeaddresses re-runs the addrman checks
@@ -402,8 +404,7 @@ def check_addr_information(result, expected):
402404
assert_equal(result["network"], expected["network"])
403405
assert_equal(result["source"], expected["source"])
404406
assert_equal(result["source_network"], expected["source_network"])
405-
# To avoid failing on slow test runners, use a 10s vspan here.
406-
assert_approx(result["time"], time.time(), vspan=10)
407+
assert_equal(result["time"], self.addr_time)
407408

408409
def check_getrawaddrman_entries(expected):
409410
"""Utility to compare a getrawaddrman result with expected addrman contents"""

0 commit comments

Comments
 (0)