diff options
author | Gennadiy Civil <misterg@google.com> | 2018-08-09 17:37:11 (GMT) |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2018-08-09 17:37:11 (GMT) |
commit | acaf5beaccf6cededfb741a1e67df0a497738265 (patch) | |
tree | c70d190e6cdd833cc3ce3ccd4771028c259242e1 /googletest | |
parent | 4d9411467dafe438a4ef04befed5ae3ae14f931a (diff) | |
download | googletest-acaf5beaccf6cededfb741a1e67df0a497738265.zip googletest-acaf5beaccf6cededfb741a1e67df0a497738265.tar.gz googletest-acaf5beaccf6cededfb741a1e67df0a497738265.tar.bz2 |
formatting and small changes related to code management, no functionality changes
Diffstat (limited to 'googletest')
-rwxr-xr-x | googletest/test/googletest-output-test.py | 11 | ||||
-rwxr-xr-x | googletest/test/gtest_test_utils.py | 8 |
2 files changed, 8 insertions, 11 deletions
diff --git a/googletest/test/googletest-output-test.py b/googletest/test/googletest-output-test.py index c1c3652..0dae8d1 100755 --- a/googletest/test/googletest-output-test.py +++ b/googletest/test/googletest-output-test.py @@ -31,12 +31,11 @@ """Tests the text output of Google C++ Testing and Mocking Framework. - -SYNOPSIS - googletest_output_test.py --build_dir=BUILD/DIR --gengolden - # where BUILD/DIR contains the built googletest-output-test_ file. - googletest_output_test.py --gengolden - googletest_output_test.py +To update the golden file: +googletest_output_test.py --build_dir=BUILD/DIR --gengolden +where BUILD/DIR contains the built googletest-output-test_ file. +googletest_output_test.py --gengolden +googletest_output_test.py """ __author__ = 'wan@google.com (Zhanyong Wan)' diff --git a/googletest/test/gtest_test_utils.py b/googletest/test/gtest_test_utils.py index d7fc099..c4c0227 100755 --- a/googletest/test/gtest_test_utils.py +++ b/googletest/test/gtest_test_utils.py @@ -36,15 +36,13 @@ __author__ = 'wan@google.com (Zhanyong Wan)' import os import sys -IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux' IS_WINDOWS = os.name == 'nt' IS_CYGWIN = os.name == 'posix' and 'CYGWIN' in os.uname()[0] import atexit import shutil import tempfile -import unittest -_test_module = unittest +import unittest as _test_module try: import subprocess @@ -74,7 +72,7 @@ def SetEnvVar(env_var, value): # Here we expose a class from a particular module, depending on the # environment. The comment suppresses the 'Invalid variable name' lint # complaint. -TestCase = _test_module.TestCase # pylint: disable-msg=C6409 +TestCase = _test_module.TestCase # pylint: disable=C6409 # Initially maps a flag to its default value. After # _ParseAndStripGTestFlags() is called, maps a flag to its actual value. @@ -88,7 +86,7 @@ def _ParseAndStripGTestFlags(argv): # Suppresses the lint complaint about a global variable since we need it # here to maintain module-wide state. - global _gtest_flags_are_parsed # pylint: disable-msg=W0603 + global _gtest_flags_are_parsed # pylint: disable=W0603 if _gtest_flags_are_parsed: return |