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

Unified Diff: chrome/test/chromedriver/test/run_py_tests.py

Issue 1132993004: [Android] Remove more references to and uses of AndroidCommands. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/screenshot.py ('k') | chrome/test/chromedriver/test/test_environment.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/chromedriver/test/run_py_tests.py
diff --git a/chrome/test/chromedriver/test/run_py_tests.py b/chrome/test/chromedriver/test/run_py_tests.py
index 3b2b6c59db12555f9292ef334bd26a66fc479bda..1dc119b107f38be40043884a9759e6f19787d45d 100755
--- a/chrome/test/chromedriver/test/run_py_tests.py
+++ b/chrome/test/chromedriver/test/run_py_tests.py
@@ -37,7 +37,6 @@ _TEST_DATA_DIR = os.path.join(chrome_paths.GetTestData(), 'chromedriver')
if util.IsLinux():
sys.path.insert(0, os.path.join(chrome_paths.GetSrc(), 'build', 'android'))
- from pylib import android_commands
from pylib import constants
from pylib import forwarder
from pylib import valgrind_tools
@@ -236,8 +235,7 @@ class ChromeDriverTest(ChromeDriverBaseTest):
chrome_paths.GetTestData())
ChromeDriverTest._sync_server = webserver.SyncWebServer()
if _ANDROID_PACKAGE_KEY:
- ChromeDriverTest._device = device_utils.DeviceUtils(
- android_commands.GetAttachedDevices()[0])
+ ChromeDriverTest._device = device_utils.DeviceUtils.HealthyDevices()[0]
http_host_port = ChromeDriverTest._http_server._server.server_port
sync_host_port = ChromeDriverTest._sync_server._server.server_port
forwarder.Forwarder.Map(
@@ -1069,8 +1067,8 @@ class ChromeDriverAndroidTest(ChromeDriverBaseTest):
print 'Unable to fetch current version info from omahaproxy (%s)' % e
def testDeviceManagement(self):
- self._drivers = [self.CreateDriver() for x in
- android_commands.GetAttachedDevices()]
+ self._drivers = [self.CreateDriver()
+ for _ in device_utils.DeviceUtils.HealthyDevices()]
self.assertRaises(chromedriver.UnknownError, self.CreateDriver)
self._drivers[0].Quit()
self._drivers[0] = self.CreateDriver()
« no previous file with comments | « build/android/screenshot.py ('k') | chrome/test/chromedriver/test/test_environment.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698