Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3720)

Unified Diff: build/android/devil/android/device_utils_test.py

Issue 1316413003: [Android] Add a configurable environment for devil/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 471ef21edc2b2f7ad2a7b443ca37ebf30a931c7b..aada2974bb2fe83fa3dcd0b8cb7ee63fd0dbae76 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 env
from devil.android import device_errors
from devil.android import device_signal
from devil.android import device_utils
@@ -23,10 +23,8 @@ 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'))
+sys.path.append(env.dependencies.pymock_path)
import mock # pylint: disable=F0401
@@ -57,6 +55,8 @@ class DeviceUtilsInitTest(unittest.TestCase):
class DeviceUtilsGetAVDsTest(mock_calls.TestCase):
+ @mock.patch('devil.env.android_sdk_config.AndroidSdkConfig.root_path',
+ mock.PropertyMock(return_value='/my/android/sdk'))
def testGetAVDs(self):
with self.assertCall(
mock.call.devil.utils.cmd_helper.GetCmdOutput(
@@ -67,8 +67,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):

Powered by Google App Engine
This is Rietveld 408576698