Skip to content

Commit c004ba4

Browse files
committed
Merge bitcoin/bitcoin#28386: test: remove fixed timeouts from feature_config_args
fbcacd4 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 fbcacd4 Tree-SHA512: 7bb3b7db2f9666b1929ffb7773c838ee98b0845569428e5d00ecf5234973d534c4f474e213896c71baabd6096a79347bd21b41a17b130053049714eb8a447c79
2 parents fb619e1 + fbcacd4 commit c004ba4

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

test/functional/feature_config_args.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,28 +249,24 @@ def test_seed_peers(self):
249249
# No peers.dat exists and -dnsseed=0
250250
# We expect the node will fallback immediately to fixed seeds
251251
assert not os.path.exists(os.path.join(default_data_dir, "peers.dat"))
252-
start = time.time()
253252
with self.nodes[0].assert_debug_log(expected_msgs=[
254253
"Loaded 0 addresses from peers.dat",
255254
"DNS seeding disabled",
256255
"Adding fixed seeds as -dnsseed=0 (or IPv4/IPv6 connections are disabled via -onlynet) and neither -addnode nor -seednode are provided\n",
257256
]):
258257
self.start_node(0, extra_args=['-dnsseed=0', '-fixedseeds=1'])
259-
assert time.time() - start < 60
260258
self.stop_node(0)
261259
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")
262260

263261
# No peers.dat exists and dns seeds are disabled.
264262
# We expect the node will not add fixed seeds when explicitly disabled.
265263
assert not os.path.exists(os.path.join(default_data_dir, "peers.dat"))
266-
start = time.time()
267264
with self.nodes[0].assert_debug_log(expected_msgs=[
268265
"Loaded 0 addresses from peers.dat",
269266
"DNS seeding disabled",
270267
"Fixed seeds are disabled",
271268
]):
272269
self.start_node(0, extra_args=['-dnsseed=0', '-fixedseeds=0'])
273-
assert time.time() - start < 60
274270
self.stop_node(0)
275271

276272
# No peers.dat exists and -dnsseed=0, but a -addnode is provided

0 commit comments

Comments
 (0)