summaryrefslogtreecommitdiffstats
path: root/googletest/test/gtest_xml_output_unittest.py
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-01-22 20:28:55 (GMT)
committerGennadiy Civil <misterg@google.com>2018-01-22 20:28:55 (GMT)
commitbbb17ad0f78cd2c6fbf5931c522db0a30deceb0a (patch)
treed049d80dc21cdd11290005bf63e8e3b70d10333d /googletest/test/gtest_xml_output_unittest.py
parentf1c87ad9f518b86a1efc2a68f452aaf53b899bfe (diff)
downloadgoogletest-bbb17ad0f78cd2c6fbf5931c522db0a30deceb0a.zip
googletest-bbb17ad0f78cd2c6fbf5931c522db0a30deceb0a.tar.gz
googletest-bbb17ad0f78cd2c6fbf5931c522db0a30deceb0a.tar.bz2
more code merge
Diffstat (limited to 'googletest/test/gtest_xml_output_unittest.py')
-rwxr-xr-xgoogletest/test/gtest_xml_output_unittest.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/googletest/test/gtest_xml_output_unittest.py b/googletest/test/gtest_xml_output_unittest.py
index 2d50b15..325ca13 100755
--- a/googletest/test/gtest_xml_output_unittest.py
+++ b/googletest/test/gtest_xml_output_unittest.py
@@ -41,7 +41,6 @@ from xml.dom import minidom, Node
import gtest_test_utils
import gtest_xml_test_utils
-
GTEST_FILTER_FLAG = '--gtest_filter'
GTEST_LIST_TESTS_FLAG = '--gtest_list_tests'
GTEST_OUTPUT_FLAG = '--gtest_output'
@@ -228,8 +227,7 @@ class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase):
'gtest_no_test_unittest')
try:
os.remove(output_file)
- except OSError:
- e = sys.exc_info()[1]
+ except OSError, e:
if e.errno != errno.ENOENT:
raise