aboutsummaryrefslogtreecommitdiff
path: root/python/pyspark/sql/conf.py
diff options
context:
space:
mode:
authorWeichenXu <WeichenXu123@outlook.com>2016-05-23 18:14:48 -0700
committerAndrew Or <andrew@databricks.com>2016-05-23 18:14:48 -0700
commita15ca5533db91fefaf3248255a59c4d94eeda1a9 (patch)
tree80867e08b17b01d96611a9a695cbb1f01c0198f6 /python/pyspark/sql/conf.py
parent5afd927a47aa7ede3039234f2f7262e2247aa2ae (diff)
downloadspark-a15ca5533db91fefaf3248255a59c4d94eeda1a9.tar.gz
spark-a15ca5533db91fefaf3248255a59c4d94eeda1a9.tar.bz2
spark-a15ca5533db91fefaf3248255a59c4d94eeda1a9.zip
[SPARK-15464][ML][MLLIB][SQL][TESTS] Replace SQLContext and SparkContext with SparkSession using builder pattern in python test code
## What changes were proposed in this pull request? Replace SQLContext and SparkContext with SparkSession using builder pattern in python test code. ## How was this patch tested? Existing test. Author: WeichenXu <WeichenXu123@outlook.com> Closes #13242 from WeichenXu123/python_doctest_update_sparksession.
Diffstat (limited to 'python/pyspark/sql/conf.py')
-rw-r--r--python/pyspark/sql/conf.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/python/pyspark/sql/conf.py b/python/pyspark/sql/conf.py
index 609d882a95..792c420ca6 100644
--- a/python/pyspark/sql/conf.py
+++ b/python/pyspark/sql/conf.py
@@ -71,11 +71,14 @@ def _test():
os.chdir(os.environ["SPARK_HOME"])
globs = pyspark.sql.conf.__dict__.copy()
- sc = SparkContext('local[4]', 'PythonTest')
- globs['sc'] = sc
- globs['spark'] = SparkSession(sc)
+ spark = SparkSession.builder\
+ .master("local[4]")\
+ .appName("sql.conf tests")\
+ .getOrCreate()
+ globs['sc'] = spark.sparkContext
+ globs['spark'] = spark
(failure_count, test_count) = doctest.testmod(pyspark.sql.conf, globs=globs)
- globs['sc'].stop()
+ spark.stop()
if failure_count:
exit(-1)