Skip to content

GitLab

Commit bbb17ad0 authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files 

more code merge
parent f1c87ad9
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
googletest/test/gtest_xml_output_unittest.py
View file @ bbb17ad0
...@@ -41,7 +41,6 @@ from xml.dom import minidom, Node ...@@ -41,7 +41,6 @@ from xml.dom import minidom, Node
import gtest_test_utils import gtest_test_utils
import gtest_xml_test_utils import gtest_xml_test_utils
GTEST_FILTER_FLAG = '--gtest_filter' GTEST_FILTER_FLAG = '--gtest_filter'
GTEST_LIST_TESTS_FLAG = '--gtest_list_tests' GTEST_LIST_TESTS_FLAG = '--gtest_list_tests'
GTEST_OUTPUT_FLAG = '--gtest_output' GTEST_OUTPUT_FLAG = '--gtest_output'
...@@ -228,8 +227,7 @@ class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase): ...@@ -228,8 +227,7 @@ class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase):
'gtest_no_test_unittest') 'gtest_no_test_unittest')
try: try:
os.remove(output_file) os.remove(output_file)
except OSError: except OSError, e:
e = sys.exc_info()[1]
if e.errno != errno.ENOENT: if e.errno != errno.ENOENT:
raise raise
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment