Partial revert of crrev.com/172937.

build/android/run_tests.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Runs all the native unit tests.
 
 1. Copy over test binary to /data/local on device.
 2. Resources: chrome/unit_tests requires resources (chrome.pak and en-US.pak)
@@ skipping 185 matching lines @@
     self.timeout = timeout
     self.performance_test = performance_test
     self.cleanup_test_files = cleanup_test_files
     self.tool = tool
     self.log_dump_name = log_dump_name
     self.fast_and_loose = fast_and_loose
     self.in_webkit_checkout = in_webkit_checkout
     self.all_tests = []
     if not self.gtest_filter:
       # No filter has been specified, let's add all tests then.
-      self.all_tests = self._GetAllEnabledTests()
+      self.all_tests, self.attached_devices = self._GetAllEnabledTests()
     self.tests = self.all_tests
 
   def _GetAllEnabledTests(self):
-    """Returns a list of all enabled tests.
+    """Get all enabled tests and available devices.
 
     Obtains a list of enabled tests from the test package on the device,
     then filters it again using the diabled list on the host.
 
+    Returns:
+      Tuple of (all enabled tests, available devices).
+
     Raises Exception if all devices failed.
     """
+    # TODO(frankf): This method is doing too much in a non-systematic way.
+    # If the intention is to drop flaky devices, why not go through all devices
+    # instead of breaking on the first succesfull run?
     available_devices = list(self.attached_devices)
     while available_devices:
       try:
-        return self._GetTestsFromDevice(available_devices[-1])
+        return (self._GetTestsFromDevice(available_devices[-1]),
+                available_devices)
       except Exception as e:
         logging.warning('Failed obtaining tests from %s %s',
                         available_devices[-1], e)
         available_devices.pop()
 
     raise Exception('No device available to get the list of tests.')
 
   def _GetTestsFromDevice(self, device):
     logging.info('Obtaining tests from %s', device)
     test_runner = SingleTestRunner(
@@ skipping 252 matching lines @@
   # the batch (this happens because the exit status is a sum of all failures
   # from all suites, but the buildbot associates the exit status only with the
   # most recent step).
   if options.exit_code:
     return failed_tests_count
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))