diff --git a/test/functional/feature_config_args.py b/test/functional/feature_config_args.py index 2e515842809..feca0f165d8 100755 --- a/test/functional/feature_config_args.py +++ b/test/functional/feature_config_args.py @@ -83,13 +83,13 @@ class ConfArgsTest(BitcoinTestFramework): self.log.debug('Verifying that disabling of the config file means garbage inside of it does ' \ 'not prevent the node from starting, and message about existing config file is logged') ignored_file_message = [f'Data directory "{self.nodes[0].datadir_path}" contains a "bitcoin.conf" file which is explicitly ignored using -noconf.'] - with self.nodes[0].assert_debug_log(timeout=60, expected_msgs=ignored_file_message): + with self.nodes[0].assert_debug_log(expected_msgs=ignored_file_message): self.start_node(0, extra_args=settings + ['-noconf']) self.stop_node(0) self.log.debug('Verifying no message appears when removing config file') os.remove(conf_path) - with self.nodes[0].assert_debug_log(timeout=60, expected_msgs=[], unexpected_msgs=ignored_file_message): + with self.nodes[0].assert_debug_log(expected_msgs=[], unexpected_msgs=ignored_file_message): self.start_node(0, extra_args=settings + ['-noconf']) self.stop_node(0) @@ -342,7 +342,7 @@ class ConfArgsTest(BitcoinTestFramework): "Loaded 0 addresses from peers.dat", "DNS seeding disabled", "Fixed seeds are disabled", - ]): + ], timeout=2): self.start_node(0, extra_args=['-dnsseed=0', '-fixedseeds=0']) self.stop_node(0) @@ -386,7 +386,7 @@ class ConfArgsTest(BitcoinTestFramework): # If the user did not disable -dnsseed, but it was soft-disabled because they provided -connect, # they shouldn't see a warning about -dnsseed being ignored. with self.nodes[0].assert_debug_log(expected_msgs=addcon_thread_started, - unexpected_msgs=dnsseed_ignored): + unexpected_msgs=dnsseed_ignored, timeout=2): self.restart_node(0, extra_args=['-connect=fakeaddress1', UNREACHABLE_PROXY_ARG]) # We have to supply expected_msgs as it's a required argument @@ -394,7 +394,7 @@ class ConfArgsTest(BitcoinTestFramework): # These cases test for -connect being supplied but only to disable it for connect_arg in ['-connect=0', '-noconnect']: with self.nodes[0].assert_debug_log(expected_msgs=addcon_thread_started, - unexpected_msgs=seednode_ignored): + unexpected_msgs=seednode_ignored, timeout=2): self.restart_node(0, extra_args=[connect_arg, '-seednode=fakeaddress2']) # Make sure -noconnect soft-disables -listen and -dnsseed. diff --git a/test/functional/p2p_invalid_tx.py b/test/functional/p2p_invalid_tx.py index 8510a95c0ae..c5d0cf98fd2 100755 --- a/test/functional/p2p_invalid_tx.py +++ b/test/functional/p2p_invalid_tx.py @@ -179,6 +179,7 @@ class InvalidTxRequestTest(BitcoinTestFramework): self.log.info('Send the block that includes the previous orphan ... ') with node.assert_debug_log(["Erased 1 orphan transaction(s) included or conflicted by block"]): node.p2ps[0].send_blocks_and_test([block_A], node, success=True) + node.syncwithvalidationinterfacequeue() self.log.info('Test that a transaction in the orphan pool conflicts with a new tip block causes erase this transaction from the orphan pool') tx_withhold_until_block_B = CTransaction() @@ -205,6 +206,7 @@ class InvalidTxRequestTest(BitcoinTestFramework): self.log.info('Send the block that includes a transaction which conflicts with the previous orphan ... ') with node.assert_debug_log(["Erased 1 orphan transaction(s) included or conflicted by block"]): node.p2ps[0].send_blocks_and_test([block_B], node, success=True) + node.syncwithvalidationinterfacequeue() if __name__ == '__main__':