formatting and small changes related to code management, no functionality changes
This commit is contained in:
		
							parent
							
								
									4d9411467d
								
							
						
					
					
						commit
						acaf5beacc
					
				@ -31,12 +31,11 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
"""Tests the text output of Google C++ Testing and Mocking Framework.
 | 
					"""Tests the text output of Google C++ Testing and Mocking Framework.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					To update the golden file:
 | 
				
			||||||
SYNOPSIS
 | 
					googletest_output_test.py --build_dir=BUILD/DIR --gengolden
 | 
				
			||||||
       googletest_output_test.py --build_dir=BUILD/DIR --gengolden
 | 
					where BUILD/DIR contains the built googletest-output-test_ file.
 | 
				
			||||||
         # where BUILD/DIR contains the built googletest-output-test_ file.
 | 
					googletest_output_test.py --gengolden
 | 
				
			||||||
       googletest_output_test.py --gengolden
 | 
					googletest_output_test.py
 | 
				
			||||||
       googletest_output_test.py
 | 
					 | 
				
			||||||
"""
 | 
					"""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
__author__ = 'wan@google.com (Zhanyong Wan)'
 | 
					__author__ = 'wan@google.com (Zhanyong Wan)'
 | 
				
			||||||
 | 
				
			|||||||
@ -36,15 +36,13 @@ __author__ = 'wan@google.com (Zhanyong Wan)'
 | 
				
			|||||||
import os
 | 
					import os
 | 
				
			||||||
import sys
 | 
					import sys
 | 
				
			||||||
 | 
					
 | 
				
			||||||
IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'
 | 
					 | 
				
			||||||
IS_WINDOWS = os.name == 'nt'
 | 
					IS_WINDOWS = os.name == 'nt'
 | 
				
			||||||
IS_CYGWIN = os.name == 'posix' and 'CYGWIN' in os.uname()[0]
 | 
					IS_CYGWIN = os.name == 'posix' and 'CYGWIN' in os.uname()[0]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import atexit
 | 
					import atexit
 | 
				
			||||||
import shutil
 | 
					import shutil
 | 
				
			||||||
import tempfile
 | 
					import tempfile
 | 
				
			||||||
import unittest
 | 
					import unittest as _test_module
 | 
				
			||||||
_test_module = unittest
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
try:
 | 
					try:
 | 
				
			||||||
  import subprocess
 | 
					  import subprocess
 | 
				
			||||||
@ -74,7 +72,7 @@ def SetEnvVar(env_var, value):
 | 
				
			|||||||
# Here we expose a class from a particular module, depending on the
 | 
					# Here we expose a class from a particular module, depending on the
 | 
				
			||||||
# environment. The comment suppresses the 'Invalid variable name' lint
 | 
					# environment. The comment suppresses the 'Invalid variable name' lint
 | 
				
			||||||
# complaint.
 | 
					# 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
 | 
					# Initially maps a flag to its default value. After
 | 
				
			||||||
# _ParseAndStripGTestFlags() is called, maps a flag to its actual value.
 | 
					# _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
 | 
					  # Suppresses the lint complaint about a global variable since we need it
 | 
				
			||||||
  # here to maintain module-wide state.
 | 
					  # 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:
 | 
					  if _gtest_flags_are_parsed:
 | 
				
			||||||
    return
 | 
					    return
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user