diff options
author | MarcoFalke <falke.marco@gmail.com> | 2018-04-04 17:27:53 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2018-04-04 17:28:43 -0400 |
commit | 2106c4c64c364ceebb556ebee3f429fb7e2f0d5a (patch) | |
tree | 690808f7430193afda6495933e7d73a692b25b7e /test/functional/feature_logging.py | |
parent | dab0d6859b8a8edbf6cda201bc9faf099964c28e (diff) | |
parent | faace13868571cc482c7e4ebcbbed83aa349d2d6 (diff) |
Merge #12853: qa: Match full plain text by default
faace13868 qa: Match full plain text by default (MarcoFalke)
Pull request description:
Instead of escaping all full plain text error strings, just compare their strings by default.
Tree-SHA512: 42e28f55105eb947ac6af6ce4056f0ec0f701d85f1c2a38b35ab777bbdf2296bdb79639c345621b8adc03a98b28c7630ded9a67b8b04a48e2c3a49d598ecdcd7
Diffstat (limited to 'test/functional/feature_logging.py')
-rwxr-xr-x | test/functional/feature_logging.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/functional/feature_logging.py b/test/functional/feature_logging.py index a4ebc7cca3..3c7aecf10a 100755 --- a/test/functional/feature_logging.py +++ b/test/functional/feature_logging.py @@ -7,6 +7,8 @@ import os from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_node import ErrorMatch + class LoggingTest(BitcoinTestFramework): def set_test_params(self): @@ -31,7 +33,7 @@ class LoggingTest(BitcoinTestFramework): invalidname = os.path.join("foo", "foo.log") self.stop_node(0) exp_stderr = "Error: Could not open debug log file \S+$" - self.nodes[0].assert_start_raises_init_error(["-debuglogfile=%s" % (invalidname)], exp_stderr) + self.nodes[0].assert_start_raises_init_error(["-debuglogfile=%s" % (invalidname)], exp_stderr, match=ErrorMatch.FULL_REGEX) assert not os.path.isfile(os.path.join(invdir, "foo.log")) # check that invalid log (relative) works after path exists @@ -44,7 +46,7 @@ class LoggingTest(BitcoinTestFramework): self.stop_node(0) invdir = os.path.join(self.options.tmpdir, "foo") invalidname = os.path.join(invdir, "foo.log") - self.nodes[0].assert_start_raises_init_error(["-debuglogfile=%s" % invalidname], exp_stderr) + self.nodes[0].assert_start_raises_init_error(["-debuglogfile=%s" % invalidname], exp_stderr, match=ErrorMatch.FULL_REGEX) assert not os.path.isfile(os.path.join(invdir, "foo.log")) # check that invalid log (absolute) works after path exists |