gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merges-6

Browse Source
This commit is contained in:
Gennadiy Civil 2018-03-05 14:21:41 -05:00
parent 731dbc4a78
commit 086825de5d
5 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
googletest/test/gtest_json_outfiles_test.py
View File

@ -32,9 +32,8 @@
import json import json
import os import os
import gtest_test_utils
import gtest_json_test_utils import gtest_json_test_utils
import gtest_test_utils
GTEST_OUTPUT_SUBDIR = 'json_outfiles' GTEST_OUTPUT_SUBDIR = 'json_outfiles'
GTEST_OUTPUT_1_TEST = 'gtest_xml_outfile1_test_' GTEST_OUTPUT_1_TEST = 'gtest_xml_outfile1_test_'

3
googletest/test/gtest_json_output_unittest.py
View File

@ -37,9 +37,8 @@ import os
import re import re
import sys import sys
import gtest_test_utils
import gtest_json_test_utils import gtest_json_test_utils
import gtest_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'

2
googletest/test/gtest_json_test_utils.py
View File

@ -44,7 +44,7 @@ def normalize(obj):
""" """
def _normalize(key, value): def _normalize(key, value):
if key == 'time': if key == 'time':
return re.sub(r'^\d+(\.\d+)?s$', u'*', value) return re.sub(r'^\d+(\.\d+)?s$', '*', value)
elif key == 'timestamp': elif key == 'timestamp':
return re.sub(r'^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\dZ$', '*', value) return re.sub(r'^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\dZ$', '*', value)
elif key == 'failure': elif key == 'failure':

2
googletest/test/gtest_test_utils.py
View File

@ -227,7 +227,7 @@ class Subprocess:
combined in a string. combined in a string.
""" """
# The subprocess module is the preferable way of running programs # The subprocess module is the preferrable way of running programs
# since it is available and behaves consistently on all platforms, # since it is available and behaves consistently on all platforms,
# including Windows. But it is only available starting in python 2.4. # including Windows. But it is only available starting in python 2.4.
# In earlier python versions, we revert to the popen2 module, which is # In earlier python versions, we revert to the popen2 module, which is

1
googletest/test/gtest_uninitialized_test.py
View File

@ -33,7 +33,6 @@
__author__ = 'wan@google.com (Zhanyong Wan)' __author__ = 'wan@google.com (Zhanyong Wan)'
import os
import gtest_test_utils import gtest_test_utils
COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_uninitialized_test_') COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_uninitialized_test_')