PYTHONPATH fixes

maropu · Jun 23, 2015 · 4c97136 · 4c97136
1 parent dcc9c09
commit 4c97136
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/python/run-tests b/python/run-tests
@@ -21,7 +21,7 @@
 FWDIR="$(cd "`dirname $0`"/..; pwd)"
 cd "$FWDIR"
 
-PYTHONPATH="$FWDIR/dev/" exec python -u ./python/run-tests.py
+exec python -u ./python/run-tests.py
 
 exit
 

diff --git a/python/run-tests.py b/python/run-tests.py
@@ -21,11 +21,17 @@
 import os
 import re
 import subprocess
+import sys
 import time
 
-from sparktestsupport import SPARK_HOME
-from sparktestsupport.shellutils import which
-from sparktestsupport.modules import all_modules
+
+# Append `SPARK_HOME/dev` to the Python path so that we can import the sparktestsupport module
+sys.path.append(os.path.join(os.path.dirname(os.path.realpath(__file__)), "../dev/"))
+
+
+from sparktestsupport import SPARK_HOME  # noqa (suppress pep8 warnings)
+from sparktestsupport.shellutils import which  # noqa
+from sparktestsupport.modules import all_modules  # noqa
 
 
 def print_red(text):