From: Doug Greiman <dgreiman@google.com>
Date: Wed, 2 Mar 2016 01:44:02 +0000 (-0800)
Subject: Fix env_var_test to ignore XML_OUTPUT_FILE if already set
X-Git-Tag: release-1.8.0~7^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6991f422b65acd1fe9212cfd6ca2153e9757ad5d;p=googletest.git

Fix env_var_test to ignore XML_OUTPUT_FILE if already set
---

diff --git a/googletest/test/gtest_env_var_test.py b/googletest/test/gtest_env_var_test.py
index 81b5966..650b546 100755
--- a/googletest/test/gtest_env_var_test.py
+++ b/googletest/test/gtest_env_var_test.py
@@ -84,6 +84,8 @@ class GTestEnvVarTest(gtest_test_utils.TestCase):
   def testEnvVarAffectsFlag(self):
     """Tests that environment variable should affect the corresponding flag."""
 
+    SetEnvVar('XML_OUTPUT_FILE', None)
+
     TestFlag('break_on_failure', '1', '0')
     TestFlag('color', 'yes', 'auto')
     TestFlag('filter', 'FooTest.Bar', '*')