From 7ff8c45d714e0f2315910838b739c0c034672015 Mon Sep 17 00:00:00 2001
From: Kousuke Saruta <sarutak@oss.nttdata.co.jp>
Date: Fri, 5 Sep 2014 11:07:00 -0700
Subject: [SPARK-3399][PySpark] Test for PySpark should ignore HADOOP_CONF_DIR
 and YARN_CONF_DIR

Author: Kousuke Saruta <sarutak@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
---
 bin/pyspark | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'bin/pyspark')

diff --git a/bin/pyspark b/bin/pyspark
index f553b314c5..26a16dd600 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
-- 
cgit v1.2.3