diff options
Diffstat (limited to 'third_party/googletest/test/gtest_xml_test_utils.py')
| -rwxr-xr-x | third_party/googletest/test/gtest_xml_test_utils.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/third_party/googletest/test/gtest_xml_test_utils.py b/third_party/googletest/test/gtest_xml_test_utils.py index afcf55e..5dd0eb9 100755 --- a/third_party/googletest/test/gtest_xml_test_utils.py +++ b/third_party/googletest/test/gtest_xml_test_utils.py @@ -105,6 +105,7 @@ class GTestXMLTestCase(gtest_test_utils.TestCase): 'testsuite': 'name', 'testcase': 'name', 'failure': 'message', + 'skipped': 'message', 'property': 'name', } @@ -169,9 +170,9 @@ class GTestXMLTestCase(gtest_test_utils.TestCase): * The stack traces are removed. """ - if element.tagName == 'testsuites': + if element.tagName in ('testsuites', 'testsuite', 'testcase'): timestamp = element.getAttributeNode('timestamp') - timestamp.value = re.sub(r'^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d$', + timestamp.value = re.sub(r'^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\d$', '*', timestamp.value) if element.tagName in ('testsuites', 'testsuite', 'testcase'): time = element.getAttributeNode('time') @@ -179,7 +180,7 @@ class GTestXMLTestCase(gtest_test_utils.TestCase): type_param = element.getAttributeNode('type_param') if type_param and type_param.value: type_param.value = '*' - elif element.tagName == 'failure': + elif element.tagName == 'failure' or element.tagName == 'skipped': source_line_pat = r'^.*[/\\](.*:)\d+\n' # Replaces the source line information with a normalized form. message = element.getAttributeNode('message') |