| Index: build/android/devil/android/md5sum_test.py
|
| diff --git a/build/android/devil/android/md5sum_test.py b/build/android/devil/android/md5sum_test.py
|
| index 440305c51c648e12fea49c7638c1d4c4a3bf3a34..7394fb56962e586f5110ecdc1da3571e6a62c792 100755
|
| --- a/build/android/devil/android/md5sum_test.py
|
| +++ b/build/android/devil/android/md5sum_test.py
|
| @@ -7,23 +7,26 @@ import os
|
| import sys
|
| import unittest
|
|
|
| +from devil import devil_env
|
| from devil.android import device_errors
|
| from devil.android import md5sum
|
| -from pylib import constants
|
|
|
| -sys.path.append(
|
| - os.path.join(constants.DIR_SOURCE_ROOT, 'third_party', 'pymock'))
|
| +devil_env.InitializeForTests()
|
| +sys.path.append(devil_env.instance.pymock_path)
|
| import mock # pylint: disable=import-error
|
|
|
| TEST_OUT_DIR = os.path.join('test', 'out', 'directory')
|
| HOST_MD5_EXECUTABLE = os.path.join(TEST_OUT_DIR, 'md5sum_bin_host')
|
| +MD5_DIST = os.path.join(TEST_OUT_DIR, 'md5sum_dist')
|
|
|
| class Md5SumTest(unittest.TestCase):
|
|
|
| def setUp(self):
|
| self._patchers = [
|
| - mock.patch('pylib.constants.GetOutDirectory',
|
| - new=mock.Mock(return_value=TEST_OUT_DIR)),
|
| + mock.patch('devil.devil_env._Environment.md5sum_host_path',
|
| + new=mock.PropertyMock(return_value=HOST_MD5_EXECUTABLE)),
|
| + mock.patch('devil.devil_env._Environment.md5sum_device_path',
|
| + new=mock.PropertyMock(return_value=MD5_DIST)),
|
| mock.patch('os.path.exists',
|
| new=mock.Mock(return_value=True)),
|
| ]
|
|
|