From 1730a267ba9bdb78a62ce4de47a978f1eb620168 Mon Sep 17 00:00:00 2001 From: fanquake Date: Tue, 5 Sep 2023 09:59:15 +0100 Subject: [PATCH] Merge bitcoin/bitcoin#28386: test: remove fixed timeouts from feature_config_args fbcacd4cf0dbe54e51f89cda05ff3db9e378ea12 test: remove fixed timeouts from feature_config_args (Martin Zumsande) Pull request description: Fixes #28290 These fixed timeouts aren't affected by the `timeout_factor` option and can therefore cause timeouts in slow environments. They are also unnecessary for the test because they measure the wrong thing: While there is an internal waiting time of 60s within `ThreadOpenConnections` (beginning only when that thread is started) for fixed seeds querying, the timeouts here don't measure that but the time from startup until a debug log message is encountered, during which many other things happen in init, so they don't make much sense to me in the first place. ACKs for top commit: MarcoFalke: lgtm ACK fbcacd4cf0dbe54e51f89cda05ff3db9e378ea12 Tree-SHA512: 7bb3b7db2f9666b1929ffb7773c838ee98b0845569428e5d00ecf5234973d534c4f474e213896c71baabd6096a79347bd21b41a17b130053049714eb8a447c79 --- test/functional/feature_config_args.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/functional/feature_config_args.py b/test/functional/feature_config_args.py index 4b8aeaba6a..b402187ce7 100755 --- a/test/functional/feature_config_args.py +++ b/test/functional/feature_config_args.py @@ -177,28 +177,24 @@ class ConfArgsTest(BitcoinTestFramework): # No peers.dat exists and -dnsseed=0 # We expect the node will fallback immediately to fixed seeds assert not os.path.exists(os.path.join(default_data_dir, "peers.dat")) - start = time.time() with self.nodes[0].assert_debug_log(expected_msgs=[ "Loaded 0 addresses from peers.dat", "DNS seeding disabled", "Adding fixed seeds as -dnsseed=0 (or IPv4/IPv6 connections are disabled via -onlynet) and neither -addnode nor -seednode are provided\n", ]): self.start_node(0, extra_args=['-dnsseed=0', '-fixedseeds=1']) - assert time.time() - start < 60 self.stop_node(0) self.nodes[0].assert_start_raises_init_error(['-dnsseed=1', '-onlynet=i2p', '-i2psam=127.0.0.1:7656'], "Error: Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6") # No peers.dat exists and dns seeds are disabled. # We expect the node will not add fixed seeds when explicitly disabled. assert not os.path.exists(os.path.join(default_data_dir, "peers.dat")) - start = time.time() with self.nodes[0].assert_debug_log(expected_msgs=[ "Loaded 0 addresses from peers.dat", "DNS seeding disabled", "Fixed seeds are disabled", ]): self.start_node(0, extra_args=['-dnsseed=0', '-fixedseeds=0']) - assert time.time() - start < 60 self.stop_node(0) # No peers.dat exists and -dnsseed=0, but a -addnode is provided