diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-06-10 13:13:17 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-06-10 13:13:17 -0700 |
| commit | fb499be1ac935b6f91046ec8ff23ac1267c82342 (patch) | |
| tree | 287de3a1e775bcf41124a6115329704dc3139d4d /bin/pyspark | |
| parent | db0c038a66cb228bcb62a5607cd0ed013d0f9f20 (diff) | |
| download | spark-fb499be1ac935b6f91046ec8ff23ac1267c82342.tar.gz spark-fb499be1ac935b6f91046ec8ff23ac1267c82342.tar.bz2 spark-fb499be1ac935b6f91046ec8ff23ac1267c82342.zip | |
HOTFIX: Fix Python tests on Jenkins.
Author: Patrick Wendell <pwendell@gmail.com>
Closes #1036 from pwendell/jenkins-test and squashes the following commits:
9c99856 [Patrick Wendell] Better output during tests
71e7b74 [Patrick Wendell] Removing incorrect python path
74984db [Patrick Wendell] HOTFIX: Allow PySpark tests to run on Jenkins.
Diffstat (limited to 'bin/pyspark')
| -rwxr-xr-x | bin/pyspark | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/pyspark b/bin/pyspark index d0fa56f319..114cbbc3a8 100755 --- a/bin/pyspark +++ b/bin/pyspark @@ -86,6 +86,10 @@ else if [[ "$IPYTHON" = "1" ]]; then exec ipython $IPYTHON_OPTS else - exec "$PYSPARK_PYTHON" + if [[ -n $SPARK_TESTING ]]; then + exec "$PYSPARK_PYTHON" -m doctest + else + exec "$PYSPARK_PYTHON" + fi fi fi |