git commit: [SPARK-3399][PySpark] Test for PySpark should ignore HADOOP_CONF_DIR and YARN_CONF_DIR

[jo...@apache.org]

Repository: spark
Updated Branches:
  refs/heads/master 62c557609 -> 7ff8c45d7


[SPARK-3399][PySpark] Test for PySpark should ignore HADOOP_CONF_DIR and YARN_CONF_DIR

Author: Kousuke Saruta <sa...@oss.nttdata.co.jp>

Closes #2270 from sarutak/SPARK-3399 and squashes the following commits:

7613be6 [Kousuke Saruta] Modified pyspark script to ignore environment variables YARN_CONF_DIR and HADOOP_CONF_DIR while testing


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7ff8c45d
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7ff8c45d
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7ff8c45d

Branch: refs/heads/master
Commit: 7ff8c45d714e0f2315910838b739c0c034672015
Parents: 62c5576
Author: Kousuke Saruta <sa...@oss.nttdata.co.jp>
Authored: Fri Sep 5 11:07:00 2014 -0700
Committer: Josh Rosen <jo...@apache.org>
Committed: Fri Sep 5 11:07:00 2014 -0700

----------------------------------------------------------------------
 bin/pyspark | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/7ff8c45d/bin/pyspark
----------------------------------------------------------------------
diff --git a/bin/pyspark b/bin/pyspark
index f553b31..26a16dd 100755
--- a/bin/pyspark
+++ b/bin/pyspark
@@ -85,6 +85,8 @@ export PYSPARK_SUBMIT_ARGS
 
 # For pyspark tests
 if [[ -n "$SPARK_TESTING" ]]; then
+  unset YARN_CONF_DIR
+  unset HADOOP_CONF_DIR
   if [[ -n "$PYSPARK_DOC_TEST" ]]; then
     exec "$PYSPARK_PYTHON" -m doctest $1
   else


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org