Merge bitcoin/bitcoin#30174: test: Set mocktime in p2p_disconnect_ban.py to avoid intermittent test failure

4444de1 test: Set mocktime in p2p_disconnect_ban.py to avoid intermittent test failure (MarcoFalke)
fa6aa40 test: Fix typos and use names args (MarcoFalke)

Pull request description:

  Otherwise, the test may fail on slow hardware when running in valgrind.

  Also, use named args for the absolute timepoint, while touching this file.

ACKs for top commit:
  tdb3:
    ACK for 4444de1
  AngusP:
    re-ACK 4444de1

Tree-SHA512: 660269c8dd18887d69b284f38656899caf028159ce83ddf921f3e9c080a5d0e663989f0e42b4baf4c4939f20f34da0e7e844dff9b7c91d0cab570c60958bd0e1

Author: fanquake

test/functional/p2p_disconnect_ban.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2014-2022 The Bitcoin Core developers
+# Copyright (c) 2014-present The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Test node disconnect and ban behavior"""
@@ -18,7 +18,7 @@ def set_test_params(self):
         self.supports_cli = False
 
     def run_test(self):
-        self.log.info("Connect nodes both way")
+        self.log.info("Connect nodes both ways")
         # By default, the test framework sets up an addnode connection from
         # node 1 --> node0. By connecting node0 --> node 1, we're left with
         # the two nodes being connected both ways.
@@ -84,7 +84,7 @@ def run_test(self):
         assert_equal("192.168.0.1/32", listBeforeShutdown[2]['address'])
 
         self.log.info("setban: test banning with absolute timestamp")
-        self.nodes[1].setban("192.168.0.2", "add", old_time + 120, True)
+        self.nodes[1].setban("192.168.0.2", "add", old_time + 120, absolute=True)
 
         # Move time forward by 3 seconds so the fourth ban has expired
         self.nodes[1].setmocktime(old_time + 3)
@@ -102,7 +102,9 @@ def run_test(self):
                 assert_equal(ban["ban_duration"], 120)
                 assert_equal(ban["time_remaining"], 117)
 
-        self.restart_node(1)
+        # Keep mocktime, to avoid ban expiry when restart takes longer than
+        # time_remaining
+        self.restart_node(1, extra_args=[f"-mocktime={old_time+4}"])
 
         listAfterShutdown = self.nodes[1].listbanned()
         assert_equal("127.0.0.0/24", listAfterShutdown[0]['address'])
@@ -113,7 +115,7 @@ def run_test(self):
 
         # Clear ban lists
         self.nodes[1].clearbanned()
-        self.log.info("Connect nodes both way")
+        self.log.info("Connect nodes both ways")
         self.connect_nodes(0, 1)
         self.connect_nodes(1, 0)