aboutsummaryrefslogtreecommitdiff
path: root/python/pyspark/tests.py
diff options
context:
space:
mode:
authorSandy Ryza <sandy@cloudera.com>2014-04-29 23:24:34 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-04-29 23:24:34 -0700
commitff5be9a41e52454e0f9cae83dd1fd50fbeaa684a (patch)
tree5bd17eaa50b3120317370821104c9c6d9e238b56 /python/pyspark/tests.py
parent7025dda8fa84b57d6f12bc770df2fa10eef21d88 (diff)
downloadspark-ff5be9a41e52454e0f9cae83dd1fd50fbeaa684a.tar.gz
spark-ff5be9a41e52454e0f9cae83dd1fd50fbeaa684a.tar.bz2
spark-ff5be9a41e52454e0f9cae83dd1fd50fbeaa684a.zip
SPARK-1004. PySpark on YARN
This reopens https://github.com/apache/incubator-spark/pull/640 against the new repo Author: Sandy Ryza <sandy@cloudera.com> Closes #30 from sryza/sandy-spark-1004 and squashes the following commits: 89889d4 [Sandy Ryza] Move unzipping py4j to the generate-resources phase so that it gets included in the jar the first time 5165a02 [Sandy Ryza] Fix docs fd0df79 [Sandy Ryza] PySpark on YARN
Diffstat (limited to 'python/pyspark/tests.py')
-rw-r--r--python/pyspark/tests.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/python/pyspark/tests.py b/python/pyspark/tests.py
index 527104587f..8cf9d9cf1b 100644
--- a/python/pyspark/tests.py
+++ b/python/pyspark/tests.py
@@ -30,10 +30,12 @@ import unittest
from pyspark.context import SparkContext
from pyspark.files import SparkFiles
-from pyspark.java_gateway import SPARK_HOME
from pyspark.serializers import read_int
+SPARK_HOME = os.environ["SPARK_HOME"]
+
+
class PySparkTestCase(unittest.TestCase):
def setUp(self):