diff options
| author | fanquake <fanquake@gmail.com> | 2022-01-07 07:48:59 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-01-07 07:49:13 +0800 |
| commit | be72ae25a81823d84e67a3abd5b3b773c92d3253 (patch) | |
| tree | e9d7f60b30219ca61b5feef93edbe521e261f8ff | |
| parent | 95833c012e14a747135fde584b1040f2dc0ae605 (diff) | |
| parent | c9374af10227be3e4c9d4fb5fbd1027841361f14 (diff) | |
Merge bitcoin/bitcoin#23996: test: set ban after mocking time
c9374af10227be3e4c9d4fb5fbd1027841361f14 test: set ban after mocking time (brunoerg)
Pull request description:
Fixes #23988
Set ban after mocking time to avoid intermittent failures related to the assertion of ban_duration and time_remaining.
See: https://cirrus-ci.com/task/6754020390862848?logs=ci#L4652
ACKs for top commit:
mzumsande:
Tested ACK c9374af10227be3e4c9d4fb5fbd1027841361f14
vincenzopalazzo:
ACK https://github.com/bitcoin/bitcoin/pull/23996/commits/c9374af10227be3e4c9d4fb5fbd1027841361f14
Tree-SHA512: fac3ac91a045bb46334d7c568f6a53a3b0a45b306914a54ea13bcc845734eaaad1ff295ff3ab158037fd9d08df77344058331336110b8f7888832b16b0589be5
| -rwxr-xr-x | test/functional/p2p_disconnect_ban.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/p2p_disconnect_ban.py b/test/functional/p2p_disconnect_ban.py index 721a5a4c57..7284ecde83 100755 --- a/test/functional/p2p_disconnect_ban.py +++ b/test/functional/p2p_disconnect_ban.py @@ -57,11 +57,11 @@ class DisconnectBanTest(BitcoinTestFramework): assert_equal(len(self.nodes[1].listbanned()), 0) self.log.info("setban: test persistence across node restart") - self.nodes[1].setban("127.0.0.0/32", "add") - self.nodes[1].setban("127.0.0.0/24", "add") # Set the mocktime so we can control when bans expire old_time = int(time.time()) self.nodes[1].setmocktime(old_time) + self.nodes[1].setban("127.0.0.0/32", "add") + self.nodes[1].setban("127.0.0.0/24", "add") self.nodes[1].setban("192.168.0.1", "add", 1) # ban for 1 seconds self.nodes[1].setban("2001:4d48:ac57:400:cacf:e9ff:fe1d:9c63/19", "add", 1000) # ban for 1000 seconds listBeforeShutdown = self.nodes[1].listbanned() |