diff options
| author | Xiangrui Meng <meng@databricks.com> | 2014-05-14 14:57:17 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2014-05-14 14:57:24 -0700 |
| commit | 31faec790f7b284b95907c66f0ee1914dd4c9fa2 (patch) | |
| tree | d5d4b796f679aca66998ea93d351e3ea66828638 /python | |
| parent | 8e13ab2fe25d2fd50ee84a42f0f2d248432c7734 (diff) | |
| download | spark-31faec790f7b284b95907c66f0ee1914dd4c9fa2.tar.gz spark-31faec790f7b284b95907c66f0ee1914dd4c9fa2.tar.bz2 spark-31faec790f7b284b95907c66f0ee1914dd4c9fa2.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
(cherry picked from commit 94c6c06ea13032b80610b3f54401d2ef2aa4874a)
Signed-off-by: Reynold Xin <rxin@apache.org>
Diffstat (limited to 'python')
| -rw-r--r-- | python/pyspark/conf.py | 2 |
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") |