diff options
author | fanquake <fanquake@gmail.com> | 2023-10-02 13:55:56 +0100 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2023-10-02 14:07:20 +0100 |
commit | 8909667ab8a65478e0eaa6495299305ad836e835 (patch) | |
tree | 102747fa2b924414fec6e734c0f0b256e63f702a /test/functional/feature_addrman.py | |
parent | 50f250a67dcc6450abaac2598be0beb86b9e7a48 (diff) | |
parent | 380130d9d70f8f8d395949a51f43806f6e600efa (diff) | |
download | bitcoin-8909667ab8a65478e0eaa6495299305ad836e835.tar.xz |
Merge bitcoin/bitcoin#28176: tests: add coverage to feature_addrman.py
380130d9d70f8f8d395949a51f43806f6e600efa test: add coverage to feature_addrman.py (kevkevin)
Pull request description:
I added two new tests that will cover the nNew and nTried tests which add coverage to the if block by checking values larger than our range since we only check for negative values now
adding coverage to these lines
https://github.com/bitcoin/bitcoin/blob/master/src/addrman.cpp#L273
https://github.com/bitcoin/bitcoin/blob/master/src/addrman.cpp#L280
our test seem to only cover the `nTried < 0` and `nNew < 0` scenarios
ACKs for top commit:
ismaelsadeeq:
ACK 380130d9d70f8f8d395949a51f43806f6e600efa, code looks good to me 🍃 .
0xB10C:
Re-ACK 380130d9d70f8f8d395949a51f43806f6e600efa
Tree-SHA512: a063bd9ca4d2d536a27c8c22a28fb13759a96f19cd8ba6cb8879cf7f65046d4ff6e8f70df17feaffd0d0d08ef914cb18a11258d313a4841c811a7e7ae4df6d5b
Diffstat (limited to 'test/functional/feature_addrman.py')
-rwxr-xr-x | test/functional/feature_addrman.py | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/test/functional/feature_addrman.py b/test/functional/feature_addrman.py index d901b7bcf9..9839993115 100755 --- a/test/functional/feature_addrman.py +++ b/test/functional/feature_addrman.py @@ -9,12 +9,12 @@ import re import struct from test_framework.messages import ser_uint256, hash256 +from test_framework.netutil import ADDRMAN_NEW_BUCKET_COUNT, ADDRMAN_TRIED_BUCKET_COUNT, ADDRMAN_BUCKET_SIZE from test_framework.p2p import MAGIC_BYTES from test_framework.test_framework import BitcoinTestFramework from test_framework.test_node import ErrorMatch from test_framework.util import assert_equal - def serialize_addrman( *, format=1, @@ -117,17 +117,34 @@ class AddrmanTest(BitcoinTestFramework): self.log.info("Check that corrupt addrman cannot be read (len_tried)") self.stop_node(0) + max_len_tried = ADDRMAN_TRIED_BUCKET_COUNT * ADDRMAN_BUCKET_SIZE write_addrman(peers_dat, len_tried=-1) self.nodes[0].assert_start_raises_init_error( - expected_msg=init_error("Corrupt AddrMan serialization: nTried=-1, should be in \\[0, 16384\\]:.*"), + expected_msg=init_error(f"Corrupt AddrMan serialization: nTried=-1, should be in \\[0, {max_len_tried}\\]:.*"), + match=ErrorMatch.FULL_REGEX, + ) + + self.log.info("Check that corrupt addrman cannot be read (large len_tried)") + write_addrman(peers_dat, len_tried=max_len_tried + 1) + self.nodes[0].assert_start_raises_init_error( + expected_msg=init_error(f"Corrupt AddrMan serialization: nTried={max_len_tried + 1}, should be in \\[0, {max_len_tried}\\]:.*"), match=ErrorMatch.FULL_REGEX, ) self.log.info("Check that corrupt addrman cannot be read (len_new)") self.stop_node(0) + max_len_new = ADDRMAN_NEW_BUCKET_COUNT * ADDRMAN_BUCKET_SIZE write_addrman(peers_dat, len_new=-1) self.nodes[0].assert_start_raises_init_error( - expected_msg=init_error("Corrupt AddrMan serialization: nNew=-1, should be in \\[0, 65536\\]:.*"), + expected_msg=init_error(f"Corrupt AddrMan serialization: nNew=-1, should be in \\[0, {max_len_new}\\]:.*"), + match=ErrorMatch.FULL_REGEX, + ) + + self.log.info("Check that corrupt addrman cannot be read (large len_new)") + self.stop_node(0) + write_addrman(peers_dat, len_new=max_len_new + 1) + self.nodes[0].assert_start_raises_init_error( + expected_msg=init_error(f"Corrupt AddrMan serialization: nNew={max_len_new + 1}, should be in \\[0, {max_len_new}\\]:.*"), match=ErrorMatch.FULL_REGEX, ) |