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 pull request #9171 from mvdbeek/fix_shell_runner_returncode

Browse Source 
[19.09] Fix LocalShell returncode
This commit is contained in:
Nicola Soranzo
2019-12-30 09:40:44 +01:00
committed by GitHub
parent 2e91dd121f 3859735c27
commit fc24bb27b5
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/jobs/runners/util/cli/shell/local.py
+4
View File
@@ -34,6 +34,8 @@ class LocalShell(BaseShellExec):
True
>>> exec_result.stdout.strip() == u'Hello World'
True
>>> exec_result.returncode
0
>>> exec_result = exec_python("import time; time.sleep(10)", timeout=1, timeout_check_interval=.1)
>>> exec_result.stdout == u''
True
@@ -63,6 +65,8 @@ class LocalShell(BaseShellExec):
kill_pg(p.pid)
return Bunch(stdout=u'', stderr=TIMEOUT_ERROR_MESSAGE, returncode=TIMEOUT_RETURN_CODE)
outf.seek(0)
# Need to poll once to establish return code
p.poll()
return Bunch(stdout=_read_str(outf), stderr=_read_str(p.stderr), returncode=p.returncode)