diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-01-02 15:49:22 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-01-02 15:49:22 -0500 |
| commit | 25905b9f9a45911218b24d920a67a0b8a37d7e3a (patch) | |
| tree | 2b18e0300295b01457bbd000b472b249ebfe9b9e /googletest/test/gtest_xml_output_unittest.py | |
| parent | 4665eee10a1d495aec9970fddf6231cf2339b1b7 (diff) | |
| parent | 3bedb5a9fc36769691c057b9e9414472035463b4 (diff) | |
| download | googletest-25905b9f9a45911218b24d920a67a0b8a37d7e3a.tar.gz googletest-25905b9f9a45911218b24d920a67a0b8a37d7e3a.zip | |
Merge branch 'master' of https://github.com/google/googletest
Diffstat (limited to 'googletest/test/gtest_xml_output_unittest.py')
| -rwxr-xr-x | googletest/test/gtest_xml_output_unittest.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/googletest/test/gtest_xml_output_unittest.py b/googletest/test/gtest_xml_output_unittest.py index faedd4e6..ab733d1d 100755 --- a/googletest/test/gtest_xml_output_unittest.py +++ b/googletest/test/gtest_xml_output_unittest.py @@ -65,7 +65,7 @@ else: sys.argv.remove(NO_STACKTRACE_SUPPORT_FLAG) EXPECTED_NON_EMPTY_XML = """<?xml version="1.0" encoding="UTF-8"?> -<testsuites tests="23" failures="4" disabled="2" errors="0" time="*" timestamp="*" name="AllTests" ad_hoc_property="42"> +<testsuites tests="24" failures="4" disabled="2" errors="0" time="*" timestamp="*" name="AllTests" ad_hoc_property="42"> <testsuite name="SuccessfulTest" tests="1" failures="0" disabled="0" errors="0" time="*"> <testcase name="Succeeds" status="run" time="*" classname="SuccessfulTest"/> </testsuite> @@ -108,6 +108,9 @@ Invalid characters in brackets []%(stack)s]]></failure> <testsuite name="DisabledTest" tests="1" failures="0" disabled="1" errors="0" time="*"> <testcase name="DISABLED_test_not_run" status="notrun" time="*" classname="DisabledTest"/> </testsuite> + <testsuite name="SkippedTest" tests="1" failures="0" disabled="0" errors="0" time="*"> + <testcase name="Skipped" status="skipped" time="*" classname="SkippedTest"/> + </testsuite> <testsuite name="PropertyRecordingTest" tests="4" failures="0" disabled="0" errors="0" time="*" SetUpTestCase="yes" TearDownTestCase="aye"> <testcase name="OneProperty" status="run" time="*" classname="PropertyRecordingTest"> <properties> @@ -183,15 +186,15 @@ EXPECTED_SHARDED_TEST_XML = """<?xml version="1.0" encoding="UTF-8"?> <testsuite name="SuccessfulTest" tests="1" failures="0" disabled="0" errors="0" time="*"> <testcase name="Succeeds" status="run" time="*" classname="SuccessfulTest"/> </testsuite> - <testsuite name="NoFixtureTest" tests="1" failures="0" disabled="0" errors="0" time="*"> - <testcase name="RecordProperty" status="run" time="*" classname="NoFixtureTest"> - <properties> - <property name="key" value="1"/> - </properties> - </testcase> + <testsuite name="PropertyRecordingTest" tests="1" failures="0" disabled="0" errors="0" time="*" SetUpTestCase="yes" TearDownTestCase="aye"> + <testcase name="TwoValuesForOneKeyUsesLastValue" status="run" time="*" classname="PropertyRecordingTest"> + <properties> + <property name="key_1" value="2"/> + </properties> + </testcase> </testsuite> <testsuite name="Single/ValueParamTest" tests="1" failures="0" disabled="0" errors="0" time="*"> - <testcase name="AnotherTestThatHasValueParamAttribute/1" value_param="42" status="run" time="*" classname="Single/ValueParamTest" /> + <testcase name="AnotherTestThatHasValueParamAttribute/0" value_param="33" status="run" time="*" classname="Single/ValueParamTest" /> </testsuite> </testsuites>""" @@ -266,7 +269,8 @@ class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase): 'gtest_no_test_unittest') try: os.remove(output_file) - except OSError, e: + except OSError: + e = sys.exc_info()[1] if e.errno != errno.ENOENT: raise |
