diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-03-05 19:21:41 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-03-05 19:21:41 (GMT) |
| commit | 086825de5d5cd13ad9a71221edcce74363939981 (patch) | |
| tree | a0bd3625b95dc21731202ff20049c41a3c6690ed /googletest | |
| parent | 731dbc4a7879b66a14e41c3fbb14101cb30865eb (diff) | |
| download | googletest-086825de5d5cd13ad9a71221edcce74363939981.zip googletest-086825de5d5cd13ad9a71221edcce74363939981.tar.gz googletest-086825de5d5cd13ad9a71221edcce74363939981.tar.bz2 | |
merges-6refs/pull/1491/head
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/test/gtest_json_outfiles_test.py | 3 | ||||
| -rw-r--r-- | googletest/test/gtest_json_output_unittest.py | 3 | ||||
| -rw-r--r-- | googletest/test/gtest_json_test_utils.py | 2 | ||||
| -rwxr-xr-x | googletest/test/gtest_test_utils.py | 2 | ||||
| -rwxr-xr-x | googletest/test/gtest_uninitialized_test.py | 1 |
5 files changed, 4 insertions, 7 deletions
diff --git a/googletest/test/gtest_json_outfiles_test.py b/googletest/test/gtest_json_outfiles_test.py index 62ad18e..46010d8 100644 --- a/googletest/test/gtest_json_outfiles_test.py +++ b/googletest/test/gtest_json_outfiles_test.py @@ -32,9 +32,8 @@ import json import os -import gtest_test_utils import gtest_json_test_utils - +import gtest_test_utils GTEST_OUTPUT_SUBDIR = 'json_outfiles' GTEST_OUTPUT_1_TEST = 'gtest_xml_outfile1_test_' diff --git a/googletest/test/gtest_json_output_unittest.py b/googletest/test/gtest_json_output_unittest.py index 4d23c3a..12047c4 100644 --- a/googletest/test/gtest_json_output_unittest.py +++ b/googletest/test/gtest_json_output_unittest.py @@ -37,9 +37,8 @@ import os import re import sys -import gtest_test_utils import gtest_json_test_utils - +import gtest_test_utils GTEST_FILTER_FLAG = '--gtest_filter' GTEST_LIST_TESTS_FLAG = '--gtest_list_tests' diff --git a/googletest/test/gtest_json_test_utils.py b/googletest/test/gtest_json_test_utils.py index 4ef5f6f..62bbfc2 100644 --- a/googletest/test/gtest_json_test_utils.py +++ b/googletest/test/gtest_json_test_utils.py @@ -44,7 +44,7 @@ def normalize(obj): """ def _normalize(key, value): if key == 'time': - return re.sub(r'^\d+(\.\d+)?s$', u'*', value) + return re.sub(r'^\d+(\.\d+)?s$', '*', value) elif key == 'timestamp': return re.sub(r'^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\dZ$', '*', value) elif key == 'failure': diff --git a/googletest/test/gtest_test_utils.py b/googletest/test/gtest_test_utils.py index cc4ba64..7c48933 100755 --- a/googletest/test/gtest_test_utils.py +++ b/googletest/test/gtest_test_utils.py @@ -227,7 +227,7 @@ class Subprocess: 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, # including Windows. But it is only available starting in python 2.4. # In earlier python versions, we revert to the popen2 module, which is diff --git a/googletest/test/gtest_uninitialized_test.py b/googletest/test/gtest_uninitialized_test.py index 574db77..ae91f2a 100755 --- a/googletest/test/gtest_uninitialized_test.py +++ b/googletest/test/gtest_uninitialized_test.py @@ -33,7 +33,6 @@ __author__ = 'wan@google.com (Zhanyong Wan)' -import os import gtest_test_utils COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_uninitialized_test_') |