Repository: spark Updated Branches: refs/heads/branch-1.0 8e13ab2fe -> 31faec790
[FIX] do not load defaults when testing SparkConf in pyspark The default constructor loads default properties, which can fail the test. Author: Xiangrui Meng <m...@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 <r...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/31faec79 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/31faec79 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/31faec79 Branch: refs/heads/branch-1.0 Commit: 31faec790f7b284b95907c66f0ee1914dd4c9fa2 Parents: 8e13ab2 Author: Xiangrui Meng <m...@databricks.com> Authored: Wed May 14 14:57:17 2014 -0700 Committer: Reynold Xin <r...@apache.org> Committed: Wed May 14 14:57:24 2014 -0700 ---------------------------------------------------------------------- python/pyspark/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/31faec79/python/pyspark/conf.py ---------------------------------------------------------------------- diff --git a/python/pyspark/conf.py b/python/pyspark/conf.py index 49b68d5..8eff4a2 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")
