aboutsummaryrefslogtreecommitdiff
path: root/python/run-tests
diff options
context:
space:
mode:
authorJosh Rosen <joshrosen@eecs.berkeley.edu>2013-08-14 15:12:12 -0700
committerJosh Rosen <joshrosen@eecs.berkeley.edu>2013-08-14 15:12:12 -0700
commit7a9abb9ddc8461e101771a14ac2e5e07f1741699 (patch)
treec6af5208c8a6674735be62568e6b301702806dac /python/run-tests
parent63446f9208876b482c2aea4acc42a6713eb94f55 (diff)
downloadspark-7a9abb9ddc8461e101771a14ac2e5e07f1741699.tar.gz
spark-7a9abb9ddc8461e101771a14ac2e5e07f1741699.tar.bz2
spark-7a9abb9ddc8461e101771a14ac2e5e07f1741699.zip
Fix PySpark unit tests on Python 2.6.
Diffstat (limited to 'python/run-tests')
-rwxr-xr-xpython/run-tests26
1 files changed, 12 insertions, 14 deletions
diff --git a/python/run-tests b/python/run-tests
index 6643faa2e0..cbc554ea9d 100755
--- a/python/run-tests
+++ b/python/run-tests
@@ -26,20 +26,18 @@ cd "$FWDIR/python"
FAILED=0
-$FWDIR/pyspark pyspark/rdd.py
-FAILED=$(($?||$FAILED))
-
-$FWDIR/pyspark pyspark/context.py
-FAILED=$(($?||$FAILED))
-
-$FWDIR/pyspark -m doctest pyspark/broadcast.py
-FAILED=$(($?||$FAILED))
-
-$FWDIR/pyspark -m doctest pyspark/accumulators.py
-FAILED=$(($?||$FAILED))
-
-$FWDIR/pyspark -m unittest pyspark.tests
-FAILED=$(($?||$FAILED))
+rm -f unit-tests.log
+
+function run_test() {
+ $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 "-m doctest pyspark/broadcast.py"
+run_test "-m doctest pyspark/accumulators.py"
+run_test "pyspark/tests.py"
if [[ $FAILED != 0 ]]; then
echo -en "\033[31m" # Red