Skip to content

Commit fa730e9

Browse files
author
MarcoFalke
committed
test: Avoid connecting to real network when running tests
Can be reviewed with --word-diff-regex=.
1 parent fa1b713 commit fa730e9

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

test/functional/feature_config_args.py

+19-10
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,10 @@ def test_networkactive(self):
151151
def test_seed_peers(self):
152152
self.log.info('Test seed peers')
153153
default_data_dir = self.nodes[0].datadir
154+
# Only regtest has no fixed seeds. To avoid connections to random
155+
# nodes, regtest is the only network where it is safe to enable
156+
# -fixedseeds in tests
157+
util.assert_equal(self.nodes[0].getblockchaininfo()['chain'],'regtest')
154158
self.stop_node(0)
155159

156160
# No peers.dat exists and -dnsseed=1
@@ -160,10 +164,12 @@ def test_seed_peers(self):
160164
start = int(time.time())
161165
with self.nodes[0].assert_debug_log(expected_msgs=[
162166
"Loaded 0 addresses from peers.dat",
163-
"0 addresses found from DNS seeds"]):
164-
self.start_node(0, extra_args=['-dnsseed=1 -mocktime={}'.format(start)])
167+
"0 addresses found from DNS seeds",
168+
]):
169+
self.start_node(0, extra_args=['-dnsseed=1', '-fixedseeds=1', f'-mocktime={start}'])
165170
with self.nodes[0].assert_debug_log(expected_msgs=[
166-
"Adding fixed seeds as 60 seconds have passed and addrman is empty"]):
171+
"Adding fixed seeds as 60 seconds have passed and addrman is empty",
172+
]):
167173
self.nodes[0].setmocktime(start + 65)
168174
self.stop_node(0)
169175

@@ -174,8 +180,9 @@ def test_seed_peers(self):
174180
with self.nodes[0].assert_debug_log(expected_msgs=[
175181
"Loaded 0 addresses from peers.dat",
176182
"DNS seeding disabled",
177-
"Adding fixed seeds as -dnsseed=0, -addnode is not provided and all -seednode(s) attempted\n"]):
178-
self.start_node(0, extra_args=['-dnsseed=0'])
183+
"Adding fixed seeds as -dnsseed=0, -addnode is not provided and all -seednode(s) attempted\n",
184+
]):
185+
self.start_node(0, extra_args=['-dnsseed=0', '-fixedseeds=1'])
179186
assert time.time() - start < 60
180187
self.stop_node(0)
181188

@@ -186,7 +193,8 @@ def test_seed_peers(self):
186193
with self.nodes[0].assert_debug_log(expected_msgs=[
187194
"Loaded 0 addresses from peers.dat",
188195
"DNS seeding disabled",
189-
"Fixed seeds are disabled"]):
196+
"Fixed seeds are disabled",
197+
]):
190198
self.start_node(0, extra_args=['-dnsseed=0', '-fixedseeds=0'])
191199
assert time.time() - start < 60
192200
self.stop_node(0)
@@ -197,13 +205,14 @@ def test_seed_peers(self):
197205
start = int(time.time())
198206
with self.nodes[0].assert_debug_log(expected_msgs=[
199207
"Loaded 0 addresses from peers.dat",
200-
"DNS seeding disabled"]):
201-
self.start_node(0, extra_args=['-dnsseed=0', '-addnode=fakenodeaddr -mocktime={}'.format(start)])
208+
"DNS seeding disabled",
209+
]):
210+
self.start_node(0, extra_args=['-dnsseed=0', '-fixedseeds=1', '-addnode=fakenodeaddr', f'-mocktime={start}'])
202211
with self.nodes[0].assert_debug_log(expected_msgs=[
203-
"Adding fixed seeds as 60 seconds have passed and addrman is empty"]):
212+
"Adding fixed seeds as 60 seconds have passed and addrman is empty",
213+
]):
204214
self.nodes[0].setmocktime(start + 65)
205215

206-
207216
def run_test(self):
208217
self.test_log_buffer()
209218
self.test_args_log()

test/functional/test_framework/util.py

+1
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,7 @@ def write_config(config_path, *, n, chain, extra_config=""):
368368
f.write("keypool=1\n")
369369
f.write("discover=0\n")
370370
f.write("dnsseed=0\n")
371+
f.write("fixedseeds=0\n")
371372
f.write("listenonion=0\n")
372373
f.write("printtoconsole=0\n")
373374
f.write("upnp=0\n")

0 commit comments

Comments
 (0)