summaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-08-01 15:07:22 (GMT)
committerGennadiy Civil <misterg@google.com>2018-08-01 15:07:22 (GMT)
commit539ee4bc549846e3bd98b77f85d0aff8410ef8c0 (patch)
tree6fa9ce576184a330fdd55b7102644a642833f823 /googlemock
parent012528ccab9750f10a33d0ae38ffd0f54b9e427b (diff)
downloadgoogletest-539ee4bc549846e3bd98b77f85d0aff8410ef8c0.zip
googletest-539ee4bc549846e3bd98b77f85d0aff8410ef8c0.tar.gz
googletest-539ee4bc549846e3bd98b77f85d0aff8410ef8c0.tar.bz2
Formatting changes and upstreaming one test
Diffstat (limited to 'googlemock')
-rwxr-xr-xgooglemock/test/gmock_leak_test.py2
-rwxr-xr-xgooglemock/test/gmock_output_test.py1
2 files changed, 0 insertions, 3 deletions
diff --git a/googlemock/test/gmock_leak_test.py b/googlemock/test/gmock_leak_test.py
index 997680c..a2fee4b 100755
--- a/googlemock/test/gmock_leak_test.py
+++ b/googlemock/test/gmock_leak_test.py
@@ -33,10 +33,8 @@
__author__ = 'wan@google.com (Zhanyong Wan)'
-
import gmock_test_utils
-
PROGRAM_PATH = gmock_test_utils.GetTestExecutablePath('gmock_leak_test_')
TEST_WITH_EXPECT_CALL = [PROGRAM_PATH, '--gtest_filter=*ExpectCall*']
TEST_WITH_ON_CALL = [PROGRAM_PATH, '--gtest_filter=*OnCall*']
diff --git a/googlemock/test/gmock_output_test.py b/googlemock/test/gmock_output_test.py
index 9d73d57..8f57d46 100755
--- a/googlemock/test/gmock_output_test.py
+++ b/googlemock/test/gmock_output_test.py
@@ -43,7 +43,6 @@ __author__ = 'wan@google.com (Zhanyong Wan)'
import os
import re
import sys
-
import gmock_test_utils