diff options
| author | Hossein Falaki <falaki@gmail.com> | 2014-01-07 21:28:26 -0800 |
|---|---|---|
| committer | Hossein Falaki <falaki@gmail.com> | 2014-01-07 21:28:26 -0800 |
| commit | 46cb980a5f5ba55f341b8bcce4f0d1e5213989d3 (patch) | |
| tree | ff3823085f27c0f4477d25a056d333c429c5d6c9 /python/run-tests | |
| parent | 150089dae12bbba693db4edbfcea360b443637df (diff) | |
| parent | b2e690f839e7ee47f405135d35170173386c5d13 (diff) | |
| download | spark-46cb980a5f5ba55f341b8bcce4f0d1e5213989d3.tar.gz spark-46cb980a5f5ba55f341b8bcce4f0d1e5213989d3.tar.bz2 spark-46cb980a5f5ba55f341b8bcce4f0d1e5213989d3.zip | |
Fixed merge conflict
Diffstat (limited to 'python/run-tests')
| -rwxr-xr-x | python/run-tests | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/python/run-tests b/python/run-tests index d4dad672d2..feba97cee0 100755 --- a/python/run-tests +++ b/python/run-tests @@ -29,12 +29,13 @@ FAILED=0 rm -f unit-tests.log function run_test() { - $FWDIR/pyspark $1 2>&1 | tee -a unit-tests.log + SPARK_TESTING=0 $FWDIR/bin/pyspark $1 2>&1 | tee -a unit-tests.log FAILED=$((PIPESTATUS[0]||$FAILED)) } run_test "pyspark/rdd.py" run_test "pyspark/context.py" +run_test "pyspark/conf.py" run_test "-m doctest pyspark/broadcast.py" run_test "-m doctest pyspark/accumulators.py" run_test "-m doctest pyspark/serializers.py" |