Unverified Commit 3db96f40 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Use single quote to refer to tool_stdout / tool_stderr path in command line 



Co-authored-by: default avatarNicola Soranzo <nicola.soranzo@gmail.com>
parent 54481446

lib/galaxy/jobs/command_factory.py

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ class CommandsBuilder: 


    def capture_stdout_stderr(self, stdout_file, stderr_file, stream_stdout_stderr=False):

        if not stream_stdout_stderr:

            self.append_command(f'> "{stdout_file}" 2> "{stderr_file}"', sep="")

            self.append_command(f"> '{stdout_file}' 2> '{stderr_file}'", sep="")

            return

        trap_command = """trap 'rm -f "$__out" "$__err"' EXIT"""

        if TRAP_KILL_CONTAINER in self.commands:

test/unit/app/jobs/test_command_factory.py

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ class TestCommandFactory(TestCase): 


    stream_stdout_stderr = False

    TEE_LOG = " "

    CAPTURE_AND_REDIRECT = f'> "../outputs/tool_stdout" 2> "../outputs/tool_stderr"{RETURN_CODE_CAPTURE}'

    CAPTURE_AND_REDIRECT = f"> '../outputs/tool_stdout' 2> '../outputs/tool_stderr'{RETURN_CODE_CAPTURE}"



    def setUp(self):

        self.job_dir = mkdtemp()