Skip to content

Commit 2352aa9

Browse files
committed
test: Ensure that recursive -includeconf produces appropriate warnings
1 parent c5bcc7d commit 2352aa9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

test/functional/feature_includeconf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ def run_test(self):
5353
self.log.info("-includeconf cannot be used recursively. subversion should end with 'main; relative)/'")
5454
with open(os.path.join(self.options.tmpdir, "node0", "relative.conf"), "a", encoding="utf8") as f:
5555
f.write("includeconf=relative2.conf\n")
56-
5756
self.start_node(0)
5857

5958
subversion = self.nodes[0].getnetworkinfo()["subversion"]
6059
assert subversion.endswith("main; relative)/")
60+
self.stop_node(0, expected_stderr="warning: -includeconf cannot be used from included files; ignoring -includeconf=relative2.conf")
6161

6262
self.log.info("multiple -includeconf args can be used from the base config file. subversion should end with 'main; relative; relative2)/'")
6363
with open(os.path.join(self.options.tmpdir, "node0", "relative.conf"), "w", encoding="utf8") as f:
@@ -66,7 +66,7 @@ def run_test(self):
6666
with open(os.path.join(self.options.tmpdir, "node0", "bitcoin.conf"), "a", encoding='utf8') as f:
6767
f.write("includeconf=relative2.conf\n")
6868

69-
self.restart_node(0)
69+
self.start_node(0)
7070

7171
subversion = self.nodes[0].getnetworkinfo()["subversion"]
7272
assert subversion.endswith("main; relative; relative2)/")

0 commit comments

Comments
 (0)