[PySpark] Fix tests with Python 2.6 in 0.9 branch

cocoatomo · Andrew Or · commit 7d007d352abc · 2015-01-09T09:49:15.000-08:00
[PySpark] [SPARK-2954] [SPARK-2948] [SPARK-2910] [SPARK-2101] Python 2.6 Fixes - Modify python/run-tests to test with Python 2.6 - Use unittest2 when running on Python 2.6. Author: Josh Rosen <joshrosenapache.org> Closes apache#3668 from davies/port_2365 and squashes the following commits: Author: cocoatomo <cocoatomo77@gmail.com> Closes apache#3968 from davies/fix_python_tests and squashes the following commits: ac4a353 [cocoatomo] [PySpark] Fix tests with Python 2.6 in 1.0 branch
diff --git a/python/pyspark/tests.py b/python/pyspark/tests.py
@@ -26,7 +26,16 @@
 import sys
 from tempfile import NamedTemporaryFile
 import time
-import unittest
+
+if sys.version_info[:2] <= (2, 6):
+    try:
+        import unittest2 as unittest
+    except ImportError:
+        sys.stderr.write('Please install unittest2 to test with Python 2.6 or earlier')
+        sys.exit(1)
+else:
+    import unittest
+
 
 from pyspark.context import SparkContext
 from pyspark.files import SparkFiles
diff --git a/python/run-tests b/python/run-tests
@@ -33,6 +33,16 @@ function run_test() {
     FAILED=$((PIPESTATUS[0]||$FAILED))
 }
 
+echo "Running PySpark tests. Output is in python/unit-tests.log."
+
+# Try to test with Python 2.6, since that's the minimum version that we support:
+if [ $(which python2.6) ]; then
+    export PYSPARK_PYTHON="python2.6"
+fi
+
+echo "Testing with Python version:"
+$PYSPARK_PYTHON --version
+
 run_test "pyspark/rdd.py"
 run_test "pyspark/context.py"
 run_test "pyspark/conf.py"
