From 7613be65f38d133fefd41f0a982cd97b25c12c0a Mon Sep 17 00:00:00 2001
From: Kousuke Saruta <sarutak@oss.nttdata.co.jp>
Date: Thu, 4 Sep 2014 15:37:08 +0900
Subject: [PATCH] Modified pyspark script to ignore environment variables
 YARN_CONF_DIR and HADOOP_CONF_DIR while testing

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

diff --git a/bin/pyspark b/bin/pyspark
index f553b314c5991..26a16dd600b7a 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