aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorKarl-Johan Alm <karljohan-alm@garage.co.jp>2018-05-09 16:50:02 +0900
committerKarl-Johan Alm <karljohan-alm@garage.co.jp>2018-05-10 11:06:04 +0900
commit2352aa9f3681fbcfb89a1910d9c5529dac9ca2e9 (patch)
tree302c1ceeca1d2734fca66547296071b1ded28abe /test
parentc5bcc7dbe9af7f4124e7c78159fe36eae3a304d4 (diff)
test: Ensure that recursive -includeconf produces appropriate warnings
Diffstat (limited to 'test')
-rwxr-xr-xtest/functional/feature_includeconf.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/feature_includeconf.py b/test/functional/feature_includeconf.py
index 1ead2fcb02..9ccb89af43 100755
--- a/test/functional/feature_includeconf.py
+++ b/test/functional/feature_includeconf.py
@@ -53,11 +53,11 @@ class IncludeConfTest(BitcoinTestFramework):
self.log.info("-includeconf cannot be used recursively. subversion should end with 'main; relative)/'")
with open(os.path.join(self.options.tmpdir, "node0", "relative.conf"), "a", encoding="utf8") as f:
f.write("includeconf=relative2.conf\n")
-
self.start_node(0)
subversion = self.nodes[0].getnetworkinfo()["subversion"]
assert subversion.endswith("main; relative)/")
+ self.stop_node(0, expected_stderr="warning: -includeconf cannot be used from included files; ignoring -includeconf=relative2.conf")
self.log.info("multiple -includeconf args can be used from the base config file. subversion should end with 'main; relative; relative2)/'")
with open(os.path.join(self.options.tmpdir, "node0", "relative.conf"), "w", encoding="utf8") as f:
@@ -66,7 +66,7 @@ class IncludeConfTest(BitcoinTestFramework):
with open(os.path.join(self.options.tmpdir, "node0", "bitcoin.conf"), "a", encoding='utf8') as f:
f.write("includeconf=relative2.conf\n")
- self.restart_node(0)
+ self.start_node(0)
subversion = self.nodes[0].getnetworkinfo()["subversion"]
assert subversion.endswith("main; relative; relative2)/")