From 1ec4a0900a0787358464d8bf8623a81bd6dc69dd Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Wed, 30 Aug 2023 16:47:46 -0400 Subject: [PATCH] tests: move the newline to the right place in ci includes Make sure this is generic enough to be properly usable --- run_project_tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/run_project_tests.py b/run_project_tests.py index 2290cd578..f6568d47d 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -445,9 +445,9 @@ def _run_ci_include(args: T.List[str]) -> str: return 'At least one parameter required' try: data = Path(args[0]).read_text(errors='ignore', encoding='utf-8') - return f'{header}\n{data}\n{footer}' + return f'{header}\n{data}\n{footer}\n' except Exception: - return 'Failed to open {}'.format(args[0]) + return 'Failed to open {}\n'.format(args[0]) ci_commands = { 'ci_include': _run_ci_include @@ -461,7 +461,7 @@ def run_ci_commands(raw_log: str) -> T.List[str]: cmd = shlex.split(l[11:]) if not cmd or cmd[0] not in ci_commands: continue - res += ['CI COMMAND {}:\n{}\n'.format(cmd[0], ci_commands[cmd[0]](cmd[1:]))] + res += ['CI COMMAND {}:\n{}'.format(cmd[0], ci_commands[cmd[0]](cmd[1:]))] return res class OutputMatch: