regex test

Author: ComputerCraftr

test/functional/test_framework/test_node.py

@@ -506,10 +506,14 @@ def assert_debug_log(self, expected_msgs, unexpected_msgs=None, timeout=2, with_
                 log = dl.read()
             print_log = " - " + "\n - ".join(log.splitlines())
             for unexpected_msg in unexpected_msgs:
-                if re.search(unexpected_msg if with_regex else re.escape(unexpected_msg), log, flags=re.MULTILINE):
+                if not with_regex:
+                    unexpected_msg = re.escape(unexpected_msg)
+                if re.search(unexpected_msg, log, flags=re.MULTILINE):
                     self._raise_assertion_error('Unexpected message "{}" partially matches log:\n\n{}\n\n'.format(unexpected_msg, print_log))
             for expected_msg in expected_msgs:
-                if re.search(expected_msg if with_regex else re.escape(expected_msg), log, flags=re.MULTILINE) is None:
+                if not with_regex:
+                    expected_msg = re.escape(expected_msg)
+                if re.search(expected_msg, log, flags=re.MULTILINE) is None:
                     found = False
             if found:
                 return