Merge bitcoin/bitcoin#29639: test: fix intermittent failures with test=addrman

test/functional/feature_asmap.py

@@ -39,7 +39,8 @@ def expected_messages(filename):
 class AsmapTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
-        self.extra_args = [["-checkaddrman=1"]]  # Do addrman checks on all operations.
+        # Do addrman checks on all operations and use deterministic addrman
+        self.extra_args = [["-checkaddrman=1", "-test=addrman"]]
 
     def fill_addrman(self, node_id):
         """Add 1 tried address to the addrman, followed by 1 new address."""

test/functional/rpc_net.py

@@ -329,7 +329,9 @@ def test_addpeeraddress(self):
         by first testing adding a tried table entry before testing adding a new table one.
         """
         self.log.info("Test addpeeraddress")
-        self.restart_node(1, ["-checkaddrman=1"])
+        # The node has an existing, non-deterministic addrman from a previous test.
+        # Clear it to have a deterministic addrman.
+        self.restart_node(1, ["-checkaddrman=1", "-test=addrman"], clear_addrman=True)
         node = self.nodes[1]
 
         self.log.debug("Test that addpeerinfo is a hidden RPC")