Merge #18839: test: Fix intermittent issues

fab7ee3 test: Fix p2p_leak intermittent issue (MarcoFalke)
fa8614a test: Fix intermittent p2p_segwit issue (MarcoFalke)

Pull request description:

  Fixes #18801
  Fixes #18802

ACKs for top commit:
  practicalswift:
    ACK fab7ee3 -- diff looks correct

Tree-SHA512: b5d0473ec1133aded127bef4c0c90f6b55906327cb49cbbd0776c4971cd9d5c9375fb70cc3dc8dd1f4bd8b1245c4414e803dc0d29ed4553b00eb131d27c9c128

Author: MarcoFalke

test/functional/p2p_leak.py

@@ -141,12 +141,11 @@ def run_test(self):
         assert no_verack_idlenode.unexpected_msg == False
 
         self.log.info('Check that the version message does not leak the local address of the node')
-        time_begin = int(time.time())
         p2p_version_store = self.nodes[0].add_p2p_connection(P2PVersionStore())
-        time_end = time.time()
         ver = p2p_version_store.version_received
-        assert_greater_than_or_equal(ver.nTime, time_begin)
-        assert_greater_than_or_equal(time_end, ver.nTime)
+        # Check that received time is within one hour of now
+        assert_greater_than_or_equal(ver.nTime, time.time() - 3600)
+        assert_greater_than_or_equal(time.time() + 3600, ver.nTime)
         assert_equal(ver.addrFrom.port, 0)
         assert_equal(ver.addrFrom.ip, '0.0.0.0')
         assert_equal(ver.nStartingHeight, 201)

test/functional/p2p_segwit.py

@@ -1896,12 +1896,12 @@ def test_non_standard_witness(self):
     def test_upgrade_after_activation(self):
         """Test the behavior of starting up a segwit-aware node after the softfork has activated."""
 
-        # Restart with the new binary
         self.stop_node(2)
         self.start_node(2, extra_args=["-segwitheight={}".format(SEGWIT_HEIGHT)])
         connect_nodes(self.nodes[0], 2)
 
-        self.sync_blocks()
+        # We reconnect more than 100 blocks, give it plenty of time
+        self.sync_blocks(timeout=240)
 
         # Make sure that this peer thinks segwit has activated.
         assert softfork_active(self.nodes[2], 'segwit')