aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-03-22 10:58:18 -0400
committerGennadiy Civil <misterg@google.com>2018-03-22 10:58:18 -0400
commitda71e8c870d6edfa0822dacb74add4bb19bbf4c3 (patch)
treefda1480a077a27a8a8eed0aae98c11d210a46220
parent0f6567954f42767e2f4a92d9f3b4afa679a65c16 (diff)
downloadgoogletest-da71e8c870d6edfa0822dacb74add4bb19bbf4c3.tar.gz
googletest-da71e8c870d6edfa0822dacb74add4bb19bbf4c3.tar.bz2
googletest-da71e8c870d6edfa0822dacb74add4bb19bbf4c3.zip
more merges
-rwxr-xr-xgoogletest/test/gtest_env_var_test.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/googletest/test/gtest_env_var_test.py b/googletest/test/gtest_env_var_test.py
index 7af00cee..5361508a 100755
--- a/googletest/test/gtest_env_var_test.py
+++ b/googletest/test/gtest_env_var_test.py
@@ -81,13 +81,14 @@ def TestFlag(flag, test_val, default_val):
class GTestEnvVarTest(gtest_test_utils.TestCase):
+
def testEnvVarAffectsFlag(self):
"""Tests that environment variable should affect the corresponding flag."""
TestFlag('break_on_failure', '1', '0')
TestFlag('color', 'yes', 'auto')
TestFlag('filter', 'FooTest.Bar', '*')
- SetEnvVar('XML_OUTPUT_FILE', None) # For 'output' test
+ SetEnvVar('XML_OUTPUT_FILE', None) # For 'output' test
TestFlag('output', 'xml:tmp/foo.xml', '')
TestFlag('print_time', '0', '1')
TestFlag('repeat', '999', '1')
@@ -107,7 +108,7 @@ class GTestEnvVarTest(gtest_test_utils.TestCase):
AssertEq('xml:tmp/bar.xml', GetFlag('output'))
def testXmlOutputFileOverride(self):
- """Tests that $XML_OUTPUT_FILE is overridden by $GTEST_OUTPUT"""
+ """Tests that $XML_OUTPUT_FILE is overridden by $GTEST_OUTPUT."""
SetEnvVar('GTEST_OUTPUT', 'xml:tmp/foo.xml')
SetEnvVar('XML_OUTPUT_FILE', 'tmp/bar.xml')