diff options
| author | Josh Rosen <joshrosen@databricks.com> | 2016-06-16 14:18:58 -0700 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2016-06-16 14:18:58 -0700 |
| commit | acef843f67e770f0a2709fb3fbd1a53c200b2bc5 (patch) | |
| tree | c976ba421b7bbd85f6281dda6c6e8f221dd3bd7b /dev | |
| parent | bbad4cb48df2ac3ed7edb4c02db79540bd4085d8 (diff) | |
| download | spark-acef843f67e770f0a2709fb3fbd1a53c200b2bc5.tar.gz spark-acef843f67e770f0a2709fb3fbd1a53c200b2bc5.tar.bz2 spark-acef843f67e770f0a2709fb3fbd1a53c200b2bc5.zip | |
[SPARK-15975] Fix improper Popen retcode code handling in dev/run-tests
In the `dev/run-tests.py` script we check a `Popen.retcode` for success using `retcode > 0`, but this is subtlety wrong because Popen's return code will be negative if the child process was terminated by a signal: https://docs.python.org/2/library/subprocess.html#subprocess.Popen.returncode
In order to properly handle signals, we should change this to check `retcode != 0` instead.
Author: Josh Rosen <joshrosen@databricks.com>
Closes #13692 from JoshRosen/dev-run-tests-return-code-handling.
Diffstat (limited to 'dev')
| -rwxr-xr-x | dev/run-tests.py | 2 | ||||
| -rw-r--r-- | dev/sparktestsupport/shellutils.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/dev/run-tests.py b/dev/run-tests.py index dcf1be9d95..930d7f8bd9 100755 --- a/dev/run-tests.py +++ b/dev/run-tests.py @@ -294,7 +294,7 @@ def exec_sbt(sbt_args=()): print(line, end='') retcode = sbt_proc.wait() - if retcode > 0: + if retcode != 0: exit_from_command_with_retcode(sbt_cmd, retcode) diff --git a/dev/sparktestsupport/shellutils.py b/dev/sparktestsupport/shellutils.py index d280e79707..05af87189b 100644 --- a/dev/sparktestsupport/shellutils.py +++ b/dev/sparktestsupport/shellutils.py @@ -53,7 +53,10 @@ else: def exit_from_command_with_retcode(cmd, retcode): - print("[error] running", ' '.join(cmd), "; received return code", retcode) + if retcode < 0: + print("[error] running", ' '.join(cmd), "; process was terminated by signal", -retcode) + else: + print("[error] running", ' '.join(cmd), "; received return code", retcode) sys.exit(int(os.environ.get("CURRENT_BLOCK", 255))) |