Extracted from #12379, because the changes are important on their own.
This allows for exact testing, since the match can be specified with a strict regex. Internal details (such as exact formatting of the error message) can still be fuzzed away by regex wildcards.
Hmm, I didn't notice the initial version of #12302, otherwise it would have been a Concept ACK from me
Yeah doesn't matter, utACK
Tested ACK 58122736b53390a2013630e95ff760800af160e7
Should be tested on other platforms in case stderr is different. See #12379 (comment) for example
I did a similar thing in #12302 initially and no one agreed :/
I think everyone agreed, but I argued that we should do the minimal fix required to get the v0.16 rc building and passing the tests.
@Sjors Do they still fail for you?
This allows the tests to pass on different platforms
187 | @@ -188,8 +188,10 @@ def assert_start_raises_init_error(self, extra_args=None, expected_msg=None, *ar 188 | if expected_msg is not None: 189 | log_stderr.seek(0) 190 | stderr = log_stderr.read().decode('utf-8') 191 | - if re.fullmatch(expected_msg + '\n', stderr) is None: 192 | - raise AssertionError('Expected message "{}" does not match stderr:\n"{}"'.format(expected_msg, stderr)) 193 | + if partial_match and re.search(expected_msg, stderr) is None: 194 | + raise AssertionError('Expected message "{}" does not parially match stderr:\n"{}"'.format(expected_msg, stderr)) 195 | + elif re.fullmatch(expected_msg + '\n', stderr) is None:
This is wrong. Should be elif not partial_match and re.fullmatch(...)
or nest the whole thing one level deeper:
if partial match:
if re.search(...) is None:
#assert
else:
if re.fullmatch(...) is None:
#assert
Added a commit to make the tests pass on windows
Tested ACK fae137454adc50a4e1d448ed7219a8f5344486c9. Works for me.
@MarcoFalke on MacOS 10.13.3. wallet_encryption.py still fails with a timeout. wallet_multiwallet.py and wallet_multiwallet.py --usecli now pass.
Running the full suite now; will update this comment if something new fails.
Tested ACK fae1374
@MarcoFalke on MacOS 10.13.3. wallet_encryption.py still fails with a timeout.
Huh - we don't use any remotely complex regexes, so I wonder how this can cause timeout.