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

Unified Diff: build/android/pylib/device/device_utils_test.py

Issue 1290173003: [Android] Reland of Remove android_commands and android_testrunner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed: removed references from content/telemetry.isolate and TELEMETRY_DEPS Created 5 years, 4 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
« no previous file with comments | « build/android/pylib/device/device_utils.py ('k') | build/android/pylib/gtest/test_package_apk.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/device/device_utils_test.py
diff --git a/build/android/pylib/device/device_utils_test.py b/build/android/pylib/device/device_utils_test.py
index 1d5f9efed8fc619667ee1aefa8b153f05fb4c250..580794ddb8c3aca0416ea622c590ebb3c7b4e9a9 100755
--- a/build/android/pylib/device/device_utils_test.py
+++ b/build/android/pylib/device/device_utils_test.py
@@ -19,7 +19,6 @@ import re
import sys
import unittest
-from pylib import android_commands
from pylib import cmd_helper
from pylib import constants
from pylib import device_signal
@@ -30,11 +29,6 @@ from pylib.device import intent
from pylib.sdk import split_select
from pylib.utils import mock_calls
-# RunCommand from third_party/android_testrunner/run_command.py is mocked
-# below, so its path needs to be in sys.path.
-sys.path.append(os.path.join(
- constants.DIR_SOURCE_ROOT, 'third_party', 'android_testrunner'))
-
sys.path.append(os.path.join(
constants.DIR_SOURCE_ROOT, 'third_party', 'pymock'))
import mock # pylint: disable=F0401
@@ -58,12 +52,6 @@ class DeviceUtilsInitTest(unittest.TestCase):
d = device_utils.DeviceUtils(a)
self.assertEqual(serial, d.adb.GetDeviceSerial())
- def testInitWithAndroidCommands(self):
- serial = '0fedcba987654321'
- a = android_commands.AndroidCommands(device=serial)
- d = device_utils.DeviceUtils(a)
- self.assertEqual(serial, d.adb.GetDeviceSerial())
-
def testInitWithMissing_fails(self):
with self.assertRaises(ValueError):
device_utils.DeviceUtils(None)
« no previous file with comments | « build/android/pylib/device/device_utils.py ('k') | build/android/pylib/gtest/test_package_apk.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698