[chromedriver] Reuse forwarded adb ports.

chrome/test/chromedriver/test/run_py_tests.py

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 660ac7ee1d9da578947f6c4429c596460f7f38ff..71bce28c56fef5dffaa8db75ed3b8ede78caaa27 100755
--- a/chrome/test/chromedriver/test/run_py_tests.py
+++ b/chrome/test/chromedriver/test/run_py_tests.py
@@ -76,7 +76,7 @@ _DESKTOP_NEGATIVE_FILTER = [
     'ChromeDriverTest.testSingleTapElement',
     'ChromeDriverTest.testTouchDownUpElement',
     'ChromeDriverTest.testTouchMovedElement',
-    'ChromeDriverTest.testLatestAndroidAppInstalled',
+    'ChromeDriverAndroidTest.*',
 ]
 
 
@@ -177,7 +177,8 @@ class ChromeDriverTest(ChromeDriverBaseTest):
         chrome_paths.GetTestData())
     ChromeDriverTest._sync_server = webserver.SyncWebServer()
     if _ANDROID_PACKAGE_KEY:
-      ChromeDriverTest._adb = android_commands.AndroidCommands()
+      ChromeDriverTest._adb = android_commands.AndroidCommands(
+          android_commands.GetAttachedDevices()[0])
       http_host_port = ChromeDriverTest._http_server._server.server_port
       sync_host_port = ChromeDriverTest._sync_server._server.server_port
       forwarder.Forwarder.Map(
@@ -654,12 +655,17 @@ class ChromeDriverTest(ChromeDriverBaseTest):
   def testDoesntHangOnDebugger(self):
     self._driver.ExecuteScript('debugger;')
 
+
+class ChromeDriverAndroidTest(ChromeDriverBaseTest):
+  """End to end tests for Android-specific tests."""
+
   def testLatestAndroidAppInstalled(self):
-    assert _ANDROID_PACKAGE_KEY
     if ('stable' not in _ANDROID_PACKAGE_KEY and
         'beta' not in _ANDROID_PACKAGE_KEY):
       return
 
+    self._driver = self.CreateDriver()
+
     try:
       omaha_list = json.loads(
           urllib2.urlopen('http://omahaproxy.appspot.com/all.json').read())
@@ -676,6 +682,13 @@ class ChromeDriverTest(ChromeDriverBaseTest):
     except urllib2.URLError as e:
       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.assertRaises(chromedriver.UnknownError, self.CreateDriver)
+    self._drivers[0].Quit()
+    self._drivers[0] = self.CreateDriver()
+
 
 class ChromeSwitchesCapabilityTest(ChromeDriverBaseTest):
   """Tests that chromedriver properly processes chromeOptions.args capabilities.