opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 12:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix up unit tests

Browse Source
This commit is contained in:
mvdbeek
2022-05-27 13:48:42 +02:00
parent 4e8819e793
commit 4ac1ff1034
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/unit/app/jobs/test_command_factory.py
+2 -2
View File
@@ -22,7 +22,7 @@ CAPTURE_AND_REDIRECT = f"{TEE_REDIRECT}{RETURN_CODE_CAPTURE}"
CP_WORK_DIR_OUTPUTS = '; \nif [ -f "foo" ] ; then cp "foo" "bar" ; fi'
TEE_LOG = """__out="${TMPDIR:-.}/out.$$" __err="${TMPDIR:-.}/err.$$"
mkfifo "$__out" "$__err"
trap 'rm "$__out" "$__err"' EXIT
trap 'rm -f "$__out" "$__err"' EXIT
tee -a '../outputs/tool_stdout' < "$__out" &
tee -a '../outputs/tool_stderr' < "$__err" >&2 & """
@@ -53,7 +53,7 @@ class TestCommandFactory(TestCase):
self.include_work_dir_outputs = False
self.job_wrapper.command_line = f"{TRAP_KILL_CONTAINER}{MOCK_COMMAND_LINE}"
expected_command_line = self._surround_command(MOCK_COMMAND_LINE).replace(
"""trap 'rm "$__out" "$__err"' EXIT""",
"""trap 'rm -f "$__out" "$__err"' EXIT""",
"""trap 'rm -f "$__out" "$__err"; _on_exit' EXIT"""
)
self.__assert_command_is(expected_command_line)