aboutsummaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorXiangrui Meng <meng@databricks.com>2014-05-14 14:57:17 -0700
committerReynold Xin <rxin@apache.org>2014-05-14 14:57:17 -0700
commit94c6c06ea13032b80610b3f54401d2ef2aa4874a (patch)
tree9ee04505fc5fcc9347f41dfcca7047c5f807b363 /python
parent65533c7ec03e7eedf5cd9756822863ab6f034ec9 (diff)
downloadspark-94c6c06ea13032b80610b3f54401d2ef2aa4874a.tar.gz
spark-94c6c06ea13032b80610b3f54401d2ef2aa4874a.tar.bz2
spark-94c6c06ea13032b80610b3f54401d2ef2aa4874a.zip
[FIX] do not load defaults when testing SparkConf in pyspark
The default constructor loads default properties, which can fail the test. Author: Xiangrui Meng <meng@databricks.com> Closes #775 from mengxr/pyspark-conf-fix and squashes the following commits: 83ef6c4 [Xiangrui Meng] do not load defaults when testing SparkConf in pyspark
Diffstat (limited to 'python')
-rw-r--r--python/pyspark/conf.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/pyspark/conf.py b/python/pyspark/conf.py
index 49b68d57ab..8eff4a242a 100644
--- a/python/pyspark/conf.py
+++ b/python/pyspark/conf.py
@@ -33,7 +33,7 @@ u'My app'
>>> sc.sparkHome == None
True
->>> conf = SparkConf()
+>>> conf = SparkConf(loadDefaults=False)
>>> conf.setSparkHome("/path")
<pyspark.conf.SparkConf object at ...>
>>> conf.get("spark.home")