Skip to content

Commit 96c7a04

Browse files
committed
Adapt test to new output
1 parent 0915a99 commit 96c7a04

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

test/framework/run.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -705,8 +705,9 @@ def test_check_log_for_errors(self):
705705
"enabling -Werror",
706706
"the process crashed with 0"
707707
])
708-
expected_msg = r"Found 2 error\(s\) in command output "\
709-
r"\(output: error found\n\tthe process crashed with 0\)"
708+
expected_msg = r"Found 2 error\(s\) in command output:\n"\
709+
r"\terror found\n"\
710+
r"\tthe process crashed with 0"
710711

711712
# String promoted to list
712713
self.assertErrorRegex(EasyBuildError, expected_msg, check_log_for_errors, input_text,
@@ -718,14 +719,17 @@ def test_check_log_for_errors(self):
718719
self.assertErrorRegex(EasyBuildError, expected_msg, check_log_for_errors, input_text,
719720
[(r"\b(error|crashed)\b", ERROR)])
720721

721-
expected_msg = "Found 2 potential error(s) in command output " \
722-
"(output: error found\n\tthe process crashed with 0)"
722+
expected_msg = "Found 2 potential error(s) in command output:\n"\
723+
"\terror found\n"\
724+
"\tthe process crashed with 0"
723725
init_logging(logfile, silent=True)
724726
check_log_for_errors(input_text, [(r"\b(error|crashed)\b", WARN)])
725727
stop_logging(logfile)
726728
self.assertIn(expected_msg, read_file(logfile))
727729

728-
expected_msg = r"Found 2 error\(s\) in command output \(output: error found\n\ttest failed\)"
730+
expected_msg = r"Found 2 error\(s\) in command output:\n"\
731+
r"\terror found\n"\
732+
r"\ttest failed"
729733
write_file(logfile, '')
730734
init_logging(logfile, silent=True)
731735
self.assertErrorRegex(EasyBuildError, expected_msg, check_log_for_errors, input_text, [
@@ -735,7 +739,7 @@ def test_check_log_for_errors(self):
735739
"fail"
736740
])
737741
stop_logging(logfile)
738-
expected_msg = "Found 1 potential error(s) in command output (output: the process crashed with 0)"
742+
expected_msg = "Found 1 potential error(s) in command output:\n\tthe process crashed with 0"
739743
self.assertIn(expected_msg, read_file(logfile))
740744

741745
def test_run_cmd_with_hooks(self):

0 commit comments

Comments
 (0)