mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 12:02:48 +01:00
8f745e57b7
247d5740d2 Ignore unknown config file options for now (Pieter Wuille) 04ce0d88ca Report when unknown config file options are ignored (Pieter Wuille) Pull request description: As reported by @satwo on IRC a few days ago, the current mechanism of treating unknown config file options as errors is problematic for options like `-rpcclienttimeout` which aren't defined for `bitcoind`. A full solution would be to either make all binaries be aware of each other's options, or to permit config file options that only apply to specific binaries (`bitcoind`, `bitcoin-qt`, `bitcoin-cli`). Both of these seem too invasive to introduce for 0.17. As a compromise, this PR makes it ignores those options, but still warn about it in the log file. Tree-SHA512: dfddc771b91df3031a9c98d9f3292f8f4fcd1b97ebb7317b2f457e12d9f205dc63f42721302e7258dbb53f273d7cc041a65a0a9120972769555784e1f1cc9aef
83 lines
4.0 KiB
Python
Executable File
83 lines
4.0 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
# Copyright (c) 2018 The Bitcoin Core developers
|
|
# Distributed under the MIT software license, see the accompanying
|
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
"""Tests the includeconf argument
|
|
|
|
Verify that:
|
|
|
|
1. adding includeconf to the configuration file causes the includeconf
|
|
file to be loaded in the correct order.
|
|
2. includeconf cannot be used as a command line argument.
|
|
3. includeconf cannot be used recursively (ie includeconf can only
|
|
be used from the base config file).
|
|
4. multiple includeconf arguments can be specified in the main config
|
|
file.
|
|
"""
|
|
import os
|
|
|
|
from test_framework.test_framework import BitcoinTestFramework
|
|
|
|
class IncludeConfTest(BitcoinTestFramework):
|
|
def set_test_params(self):
|
|
self.setup_clean_chain = False
|
|
self.num_nodes = 1
|
|
|
|
def setup_chain(self):
|
|
super().setup_chain()
|
|
# Create additional config files
|
|
# - tmpdir/node0/relative.conf
|
|
with open(os.path.join(self.options.tmpdir, "node0", "relative.conf"), "w", encoding="utf8") as f:
|
|
f.write("uacomment=relative\n")
|
|
# - tmpdir/node0/relative2.conf
|
|
with open(os.path.join(self.options.tmpdir, "node0", "relative2.conf"), "w", encoding="utf8") as f:
|
|
f.write("uacomment=relative2\n")
|
|
with open(os.path.join(self.options.tmpdir, "node0", "dash.conf"), "a", encoding='utf8') as f:
|
|
f.write("uacomment=main\nincludeconf=relative.conf\n")
|
|
|
|
def run_test(self):
|
|
self.log.info("-includeconf works from config file. subversion should end with 'main; relative)/'")
|
|
|
|
subversion = self.nodes[0].getnetworkinfo()["subversion"]
|
|
assert subversion.endswith("main; relative)/")
|
|
|
|
self.log.info("-includeconf cannot be used as command-line arg")
|
|
self.stop_node(0)
|
|
self.nodes[0].assert_start_raises_init_error(extra_args=["-includeconf=relative2.conf"], expected_msg="Error parsing command line arguments: -includeconf cannot be used from commandline; -includeconf=relative2.conf")
|
|
|
|
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("-includeconf cannot contain invalid arg")
|
|
|
|
# Commented out as long as we ignore invalid arguments in configuration files
|
|
#with open(os.path.join(self.options.tmpdir, "node0", "relative.conf"), "w", encoding="utf8") as f:
|
|
# f.write("foo=bar\n")
|
|
#self.nodes[0].assert_start_raises_init_error(expected_msg="Error reading configuration file: Invalid configuration value foo")
|
|
|
|
self.log.info("-includeconf cannot be invalid path")
|
|
os.remove(os.path.join(self.options.tmpdir, "node0", "relative.conf"))
|
|
self.nodes[0].assert_start_raises_init_error(expected_msg="Error reading configuration file: Failed to include configuration file relative.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:
|
|
# Restore initial file contents
|
|
f.write("uacomment=relative\n")
|
|
|
|
with open(os.path.join(self.options.tmpdir, "node0", "dash.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; relative2)/")
|
|
|
|
if __name__ == '__main__':
|
|
IncludeConfTest().main()
|