opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_18.09' into release_19.01

Browse Source
This commit is contained in:
mvdbeek
2019-03-01 18:04:44 +01:00
parent c40689dbd5 a12d9e367c
commit 739bb6310c
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/jobs/runners/util/cli/shell/local.py
+6 -1
View File
@@ -6,6 +6,8 @@ from subprocess import (
from tempfile import TemporaryFile
from time import sleep
import six
from ..shell import BaseShellExec
from ....util import (
Bunch,
@@ -37,14 +39,17 @@ class LocalShell(BaseShellExec):
True
>>> exec_result.returncode == TIMEOUT_RETURN_CODE
True
>>> shell.execute('echo hi').stdout == "hi\\n"
True
"""
def __init__(self, **kwds):
pass
def execute(self, cmd, persist=False, timeout=DEFAULT_TIMEOUT, timeout_check_interval=DEFAULT_TIMEOUT_CHECK_INTERVAL, **kwds):
is_cmd_string = isinstance(cmd, six.string_types)
outf = TemporaryFile()
p = Popen(cmd, stdin=None, stdout=outf, stderr=PIPE)
p = Popen(cmd, stdin=None, stdout=outf, stderr=PIPE, shell=is_cmd_string)
# poll until timeout
for i in range(int(timeout / timeout_check_interval)):