[Android] Push data deps before listing gtests.

build/android/pylib/gtest/setup.py

 # Copyright 2013 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.
 
 """Generates test runner factory and tests for GTests."""
 # pylint: disable=W0212
 
 import fnmatch
 import glob
 import logging
 import os
 import shutil
 import sys
 
-from pylib import android_commands
 from pylib import cmd_helper
 from pylib import constants
 
+from pylib.base import base_test_result
+from pylib.base import test_dispatcher
 from pylib.gtest import test_package_apk
 from pylib.gtest import test_package_exe
 from pylib.gtest import test_runner
 
 sys.path.insert(0,
                 os.path.join(constants.DIR_SOURCE_ROOT, 'build', 'util', 'lib',
                              'common'))
 import unittest_util # pylint: disable=F0401
 
 
@@ skipping 168 matching lines @@
     return '*'
 
   filters = [x for x in [x.strip() for x in file(filter_file_path).readlines()]
              if x and x[0] != '#']
   disabled_filter = '*-%s' % ':'.join(filters)
   logging.info('Applying filter "%s" obtained from %s',
                disabled_filter, filter_file_path)
   return disabled_filter
 
 
-def _GetTestsFromDevice(runner_factory, devices):
-  """Get a list of tests from a device.
+def _GetTests(test_options, test_package, devices):
+  """Get a list of tests.
 
   Args:
-    runner_factory: Callable that takes device and shard_index and returns
-        a TestRunner.
-    devices: A list of device ids.
+    test_options: A GTestOptions object.
+    test_package: A TestPackageApk object.
+    devices: A list of attached devices.
 
   Returns:
-    All the tests in the test suite.
+    A list of all the tests in the test suite.
   """
-  for device in devices:
-    try:
-      logging.info('Obtaining tests from %s', device)
-      return runner_factory(device, 0).GetAllTests()
-    except (android_commands.errors.WaitForResponseTimedOutError,
-            android_commands.errors.DeviceUnresponsiveError), e:
-      logging.warning('Failed obtaining test list from %s with exception: %s',
-                      device, e)
-  raise Exception('Failed to obtain test list from devices.')
+  def TestListerRunnerFactory(device, _shard_index):
+    class TestListerRunner(test_runner.TestRunner):
+      def RunTest(self, _test):
+        result = base_test_result.BaseTestResult(
+            'ListTheTests', base_test_result.ResultType.PASS)

[craigdh, 2014/04/03 21:58:06]

Since this only applies to gtests, the resulting error messages if this failed
might be more clear if the fake test was named "Get test list for gtests" or
similar.

+        result.test_list = self.GetAllTests()

[craigdh, 2014/04/03 21:58:06]

just move the code from GetAllTests() inline here, I don't believe it is used
anywhere else.

+        results = base_test_result.TestRunResults()
+        results.AddResult(result)
+        return results, None
+    return TestListerRunner(test_options, device, test_package)
+
+  results, _no_retry = test_dispatcher.RunTests(
+      ['ListTheTests'], TestListerRunnerFactory, devices)
+  tests = []
+  for r in results.GetAll():
+    tests.extend(r.test_list)
+  return tests
 
 
 def _FilterTestsUsingPrefixes(all_tests, pre=False, manual=False):
   """Removes tests with disabled prefixes.
 
   Args:
     all_tests: List of tests to filter.
     pre: If True, include tests with PRE_ prefix.
     manual: If True, include tests with MANUAL_ prefix.
 
@@ skipping 55 matching lines @@
     test_package = test_package_exe.TestPackageExecutable(
         test_options.suite_name)
     if not os.path.exists(test_package.suite_path):
       raise Exception(
           'Did not find %s target. Ensure it has been built.'
           % test_options.suite_name)
   logging.warning('Found target %s', test_package.suite_path)
 
   _GenerateDepsDirUsingIsolate(test_options.suite_name)
 
+  tests = _GetTests(test_options, test_package, devices)
+
   # Constructs a new TestRunner with the current options.
   def TestRunnerFactory(device, _shard_index):
     return test_runner.TestRunner(
         test_options,
         device,
         test_package)
 
-  tests = _GetTestsFromDevice(TestRunnerFactory, devices)
   if test_options.run_disabled:
     test_options = test_options._replace(
         test_arguments=('%s --gtest_also_run_disabled_tests' %
                         test_options.test_arguments))
   else:
     tests = _FilterDisabledTests(tests, test_options.suite_name,
                                  bool(test_options.gtest_filter))
   if test_options.gtest_filter:
     tests = unittest_util.FilterTestNames(tests, test_options.gtest_filter)
 
   # Coalesce unit tests into a single test per device
   if test_options.suite_name != 'content_browsertests':
     num_devices = len(devices)
     tests = [':'.join(tests[i::num_devices]) for i in xrange(num_devices)]
     tests = [t for t in tests if t]
 
   return (TestRunnerFactory, tests)