| Index: build/android/devil/android/device_utils_test.py
|
| diff --git a/build/android/devil/android/device_utils_test.py b/build/android/devil/android/device_utils_test.py
|
| index 6276ff2b138613a55a9f15e34615d90d393bebff..e62a360f2fceeec29fe1e04448993a611df1f0a2 100755
|
| --- a/build/android/devil/android/device_utils_test.py
|
| +++ b/build/android/devil/android/device_utils_test.py
|
| @@ -11,10 +11,10 @@ Unit tests for the contents of device_utils.py (mostly DeviceUtils).
|
| # pylint: disable=unused-argument
|
|
|
| import logging
|
| -import os
|
| import sys
|
| import unittest
|
|
|
| +from devil import devil_env
|
| from devil.android import device_errors
|
| from devil.android import device_signal
|
| from devil.android import device_utils
|
| @@ -23,10 +23,9 @@ from devil.android.sdk import intent
|
| from devil.android.sdk import version_codes
|
| from devil.utils import cmd_helper
|
| from devil.utils import mock_calls
|
| -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=F0401
|
|
|
|
|
| @@ -57,6 +56,8 @@ class DeviceUtilsInitTest(unittest.TestCase):
|
|
|
| class DeviceUtilsGetAVDsTest(mock_calls.TestCase):
|
|
|
| + @mock.patch('devil.devil_env._Environment.android_sdk_path',
|
| + mock.PropertyMock(return_value='/my/android/sdk'))
|
| def testGetAVDs(self):
|
| with self.assertCall(
|
| mock.call.devil.utils.cmd_helper.GetCmdOutput(
|
| @@ -67,8 +68,7 @@ class DeviceUtilsGetAVDsTest(mock_calls.TestCase):
|
| ' Target: Android 5.0 (API level 21)\n'
|
| ' Tag/ABI: default/x86\n'
|
| ' Skin: WVGA800\n'):
|
| - self.assertEquals(['my_android5.0'],
|
| - device_utils.GetAVDs())
|
| + self.assertEquals(['my_android5.0'], device_utils.GetAVDs())
|
|
|
|
|
| class DeviceUtilsRestartServerTest(mock_calls.TestCase):
|
|
|