diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-05-14 16:38:18 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-05-14 16:39:07 +0200 |
| commit | 682698970d453410fb2f7bd7eac060c0e63056f9 (patch) | |
| tree | 29ee7f2ad86235c7e44c0972252ddb0350130b5a /test/functional | |
| parent | 0264836695a2c260fcc50f25a5e9962098a84647 (diff) | |
| parent | 2352aa9f3681fbcfb89a1910d9c5529dac9ca2e9 (diff) | |
Merge #13197: util: warn about ignored recursive -includeconf calls
2352aa9 test: Ensure that recursive -includeconf produces appropriate warnings (Karl-Johan Alm)
c5bcc7d util: warn about recursive -includeconf arguments in configuration files (Karl-Johan Alm)
Pull request description:
This is a follow-up PR to #10267, and addresses https://github.com/bitcoin/bitcoin/pull/10267#issuecomment-387546144.
~~I am adding extra work for @jnewbery in #12755 here -- maybe I should just rebase on top of that, but not sure what the appropriate approach is here.~~
Tree-SHA512: 87f0c32436b70424e33616ffb88d7cb699f90d6a583a10237e224b28fc936d6a9df95536c8c52ee8546b3942da92b2a357e61bf87e00d1462bc10d46d3bee352
Diffstat (limited to 'test/functional')
| -rwxr-xr-x | test/functional/feature_includeconf.py | 4 |
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)/") |