aboutsummaryrefslogtreecommitdiff
path: root/python/run-tests
diff options
context:
space:
mode:
authorMatei Zaharia <matei@databricks.com>2013-12-29 20:15:07 -0500
committerMatei Zaharia <matei@databricks.com>2013-12-29 20:15:07 -0500
commiteaa8a68ff08304f713f4f75d39c61c020e0e691d (patch)
tree5543260c25af21555673154c0305a07e46f4ff6c /python/run-tests
parent11540b798d622f3883cb40b20cc30ea7d894790a (diff)
downloadspark-eaa8a68ff08304f713f4f75d39c61c020e0e691d.tar.gz
spark-eaa8a68ff08304f713f4f75d39c61c020e0e691d.tar.bz2
spark-eaa8a68ff08304f713f4f75d39c61c020e0e691d.zip
Fix some Python docs and make sure to unset SPARK_TESTING in Python
tests so we don't get the test spark.conf on the classpath.
Diffstat (limited to 'python/run-tests')
-rwxr-xr-xpython/run-tests2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/run-tests b/python/run-tests
index a0898b3c21..4b71fff7c1 100755
--- a/python/run-tests
+++ b/python/run-tests
@@ -29,7 +29,7 @@ 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))
}