diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-02-09 11:42:05 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-09 11:42:05 -0500 |
commit | b324a36c35c1f3397e0a6d664114980f3f7ddff8 (patch) | |
tree | 6ff499e0888f6cc6b0bc89aea9f512123780706f /googlemock/test/gmock_test_utils.py | |
parent | 092d0885332316ca679ac77e0f8fe1f5c368fb4f (diff) | |
parent | 22a115055a34443a01a3006bc2e0c1697c29abe1 (diff) | |
download | googletest-b324a36c35c1f3397e0a6d664114980f3f7ddff8.tar.gz googletest-b324a36c35c1f3397e0a6d664114980f3f7ddff8.tar.bz2 googletest-b324a36c35c1f3397e0a6d664114980f3f7ddff8.zip |
Merge branch 'master' into assert
Diffstat (limited to 'googlemock/test/gmock_test_utils.py')
-rwxr-xr-x | googlemock/test/gmock_test_utils.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/test/gmock_test_utils.py b/googlemock/test/gmock_test_utils.py index 1983c53b..b5130001 100755 --- a/googlemock/test/gmock_test_utils.py +++ b/googlemock/test/gmock_test_utils.py @@ -34,7 +34,6 @@ __author__ = 'wan@google.com (Zhanyong Wan)' import os import sys - # Determines path to gtest_test_utils and imports it. SCRIPT_DIR = os.path.dirname(__file__) or '.' @@ -44,9 +43,10 @@ if os.path.isdir(gtest_tests_util_dir): GTEST_TESTS_UTIL_DIR = gtest_tests_util_dir else: GTEST_TESTS_UTIL_DIR = os.path.join(SCRIPT_DIR, '../../googletest/test') - sys.path.append(GTEST_TESTS_UTIL_DIR) -import gtest_test_utils # pylint: disable-msg=C6204 + +# pylint: disable=C6204 +import gtest_test_utils def GetSourceDir(): |