diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2014-01-03 12:12:04 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2014-01-03 12:12:04 +0530 |
| commit | b4bb80002bbf0ac3642c78ae9e5c260b5da4a4cc (patch) | |
| tree | 0987c307777ba5947b43aee59233df6f3568a783 /python/run-tests | |
| parent | 08ec10de1767ca543047b79c40ab50a04ce5df2f (diff) | |
| parent | 498a5f0a1c6e82a33c2ad8c48b68bbdb8da57a95 (diff) | |
| download | spark-b4bb80002bbf0ac3642c78ae9e5c260b5da4a4cc.tar.gz spark-b4bb80002bbf0ac3642c78ae9e5c260b5da4a4cc.tar.bz2 spark-b4bb80002bbf0ac3642c78ae9e5c260b5da4a4cc.zip | |
Merge branch 'master' into spark-1002-remove-jars
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..4b71fff7c1 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/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" |