highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-08 11:44:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

test: Fix failing time check in rpc_net.py

Browse Source
This commit is contained in:
MarcoFalke
2023-10-18 10:41:20 +02:00
parent c2d4e40e45
commit fa4c6836c9
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/functional/rpc_net.py
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# Copyright (c) 2017-2022 The Bitcoin Core developers # Copyright (c) 2017-present The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
"""Test RPC calls related to net. """Test RPC calls related to net.
@@ -315,9 +315,11 @@ class NetTest(BitcoinTestFramework):
self.log.debug("Test that adding an address with invalid port fails") self.log.debug("Test that adding an address with invalid port fails")
assert_raises_rpc_error(-1, "JSON integer out of range", self.nodes[0].addpeeraddress, address="1.2.3.4", port=-1) assert_raises_rpc_error(-1, "JSON integer out of range", self.nodes[0].addpeeraddress, address="1.2.3.4", port=-1)
assert_raises_rpc_error(-1, "JSON integer out of range", self.nodes[0].addpeeraddress,address="1.2.3.4", port=65536) assert_raises_rpc_error(-1, "JSON integer out of range", self.nodes[0].addpeeraddress, address="1.2.3.4", port=65536)
self.log.debug("Test that adding a valid address to the tried table succeeds") self.log.debug("Test that adding a valid address to the tried table succeeds")
self.addr_time = int(time.time())
node.setmocktime(self.addr_time)
assert_equal(node.addpeeraddress(address="1.2.3.4", tried=True, port=8333), {"success": True}) assert_equal(node.addpeeraddress(address="1.2.3.4", tried=True, port=8333), {"success": True})
with node.assert_debug_log(expected_msgs=["CheckAddrman: new 0, tried 1, total 1 started"]): with node.assert_debug_log(expected_msgs=["CheckAddrman: new 0, tried 1, total 1 started"]):
addrs = node.getnodeaddresses(count=0) # getnodeaddresses re-runs the addrman checks addrs = node.getnodeaddresses(count=0) # getnodeaddresses re-runs the addrman checks
@@ -402,8 +404,7 @@ class NetTest(BitcoinTestFramework):
assert_equal(result["network"], expected["network"]) assert_equal(result["network"], expected["network"])
assert_equal(result["source"], expected["source"]) assert_equal(result["source"], expected["source"])
assert_equal(result["source_network"], expected["source_network"]) assert_equal(result["source_network"], expected["source_network"])
# To avoid failing on slow test runners, use a 10s vspan here. assert_equal(result["time"], self.addr_time)
assert_approx(result["time"], time.time(), vspan=10)
def check_getrawaddrman_entries(expected): def check_getrawaddrman_entries(expected):
"""Utility to compare a getrawaddrman result with expected addrman contents""" """Utility to compare a getrawaddrman result with expected addrman contents"""