diff options
author | MacroFake <falke.marco@gmail.com> | 2022-06-07 16:50:11 +0200 |
---|---|---|
committer | MacroFake <falke.marco@gmail.com> | 2022-06-07 20:54:37 +0200 |
commit | fa74b63c01db412f6a4378cb669d89496a89d02e (patch) | |
tree | d0d730c9257260dc5566e72a72e52da2f3eb534a /test/functional/test_framework | |
parent | 45d8b1e94a8e3e68f210d496330f5e16219d2a8d (diff) |
test: Fix wait_for_debug_log UnicodeDecodeError
Diffstat (limited to 'test/functional/test_framework')
-rwxr-xr-x | test/functional/test_framework/test_node.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py index 7d2db391b6..03f6c8adea 100755 --- a/test/functional/test_framework/test_node.py +++ b/test/functional/test_framework/test_node.py @@ -423,7 +423,7 @@ class TestNode(): self._raise_assertion_error('Expected messages "{}" does not partially match log:\n\n{}\n\n'.format(str(expected_msgs), print_log)) @contextlib.contextmanager - def wait_for_debug_log(self, expected_msgs, timeout=60, ignore_case=False): + def wait_for_debug_log(self, expected_msgs, timeout=60): """ Block until we see a particular debug log message fragment or until we exceed the timeout. Return: @@ -431,18 +431,17 @@ class TestNode(): """ time_end = time.time() + timeout * self.timeout_factor prev_size = self.debug_log_bytes() - re_flags = re.MULTILINE | (re.IGNORECASE if ignore_case else 0) yield while True: found = True - with open(self.debug_log_path, encoding='utf-8') as dl: + with open(self.debug_log_path, "rb") as dl: dl.seek(prev_size) log = dl.read() for expected_msg in expected_msgs: - if re.search(re.escape(expected_msg), log, flags=re_flags) is None: + if expected_msg not in log: found = False if found: |