Updates the test runner script exit codes

build/android/pylib/gtest/test_runner.py

 # 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.
 
 import glob
 import logging
 import os
 import sys
 
-from pylib import android_commands
 from pylib import cmd_helper
 from pylib import constants
-from pylib import perf_tests_helper
-from pylib.android_commands import errors
 from pylib.base import base_test_result
 from pylib.base import base_test_runner
 from pylib.utils import run_tests_helper
 
 import test_package_apk
 import test_package_executable
 
 sys.path.insert(
     0, os.path.join(constants.DIR_SOURCE_ROOT, 'tools', 'swarm_client'))
 import run_isolated
 
 
 _ISOLATE_FILE_PATHS = {
-  'base_unittests': 'base/base_unittests.isolate',
-  #'net_unittests': 'net/net_unittests.isolate',
-  #'unit_tests': 'chrome/unit_tests.isolate',
-  #'content_browsertests': 'content/content_browsertests.isolate',
-  #'content_unittests': 'content/content_unittests.isolate',
-  }
+    'base_unittests': 'base/base_unittests.isolate',

[frankf, 2013/07/08 19:13:43]

Let's not touch the style in this file. I have a pending CL that heavily
modifies this.

[gkanwar, 2013/07/08 21:17:07]

Done.

+    #'net_unittests': 'net/net_unittests.isolate',
+    #'unit_tests': 'chrome/unit_tests.isolate',
+    #'content_browsertests': 'content/content_browsertests.isolate',
+    #'content_unittests': 'content/content_unittests.isolate',
+    }
 _ISOLATE_SCRIPT = os.path.join(
     constants.DIR_SOURCE_ROOT, 'tools', 'swarm_client', 'isolate.py')
 
 
 def _GetDataFilesForTestSuite(product_dir, test_suite_basename):
   """Returns a list of data files/dirs needed by the test suite.
 
   Args:
     product_dir: Absolute path to product directory (e.g. /../out/Debug).
     test_suite_basename: The test suite basename (e.g. base_unittests).
 
   Returns:
     A list of test file and directory paths.
   """
   # TODO(frankf): *.isolated should be generated by gyp using foo_tests_run
   # targets. This is a stop-gap solution as currently there are no such
   # targets for content_unittests and content_browsertests.
   isolate_rel_path = _ISOLATE_FILE_PATHS.get(test_suite_basename)
   if isolate_rel_path:
     isolate_abs_path = os.path.join(constants.DIR_SOURCE_ROOT, isolate_rel_path)
     isolated_abs_path = os.path.join(
         product_dir, '%s.isolated' % test_suite_basename)
     assert os.path.exists(isolate_abs_path)
     isolate_cmd = [
-      'python', _ISOLATE_SCRIPT,
-      'check',
-      '--isolate=%s' % isolate_abs_path,
-      '--isolated=%s' % isolated_abs_path,
-      '-V', 'PRODUCT_DIR=%s' % product_dir,
-      '-V', 'OS=android',
-      '--outdir=%s' % product_dir,
-      ]
+        'python', _ISOLATE_SCRIPT,
+        'check',
+        '--isolate=%s' % isolate_abs_path,
+        '--isolated=%s' % isolated_abs_path,
+        '-V', 'PRODUCT_DIR=%s' % product_dir,
+        '-V', 'OS=android',
+        '--outdir=%s' % product_dir,
+        ]
     assert not cmd_helper.RunCmd(isolate_cmd)
     with open(isolated_abs_path) as f:
       isolated_content = run_isolated.load_isolated(f.read(),
                                                     os_flavor='android')
       assert isolated_content['os'] == 'android'
       return isolated_content['files'].keys()
 
   logging.info('Did not find an isolate file for the test suite.')
   # Ideally, we'd just push all test data. However, it has >100MB, and a lot
   # of the files are not relevant (some are used for browser_tests, others for
@@ skipping 72 matching lines @@
   elif test_suite_basename == 'content_unittests':
     return [
         'content/test/data/gpu/webgl_conformance_test_expectations.txt',
         'content/test/data/page_state/',
         'net/data/ssl/certificates/',
         'third_party/hyphen/hyph_en_US.dic',
         'webkit/data/dom_storage/webcore_test_database.localstorage',
         ]
   elif test_suite_basename == 'cc_perftests':
     return [
-      'cc/test/data',
+        'cc/test/data',
     ]
   elif test_suite_basename == 'perf_tests':
     return [
-      'base/test/data',
+        'base/test/data',
     ]
   elif test_suite_basename == 'content_browsertests':
     return [
         'content/test/data/content-disposition-inline.html',
         'content/test/data/title1.html',
         'content/test/data/post_message2.html',
         'content/test/data/content-sniffer-test0.html.mock-http-headers',
         'content/test/data/content-sniffer-test1.html.mock-http-headers',
         'content/test/data/speech',
         'content/test/data/page404.html.mock-http-headers',
@@ skipping 162 matching lines @@
     """Returns a list of disabled tests.
 
     Returns:
       A list of disabled tests obtained from 'filter' subdirectory.
     """
     gtest_filter_base_path = os.path.join(
         os.path.abspath(os.path.dirname(__file__)),
         'filter',
         self.test_package.test_suite_basename)
     disabled_tests = run_tests_helper.GetExpectations(
-       gtest_filter_base_path + '_disabled')
+        gtest_filter_base_path + '_disabled')
     if self._running_on_emulator:
       # Append emulator's filter file.
       disabled_tests.extend(run_tests_helper.GetExpectations(
           gtest_filter_base_path + '_emulator_additional_disabled'))
     return disabled_tests
 
   #override
   def RunTest(self, test):
     test_results = base_test_result.TestRunResults()
     if not test:
       return test_results, None
 
     try:
       self.test_package.ClearApplicationState()
       self.test_package.CreateTestRunnerScript(test, self._test_arguments)
       test_results = self.test_package.RunTestsAndListResults()
-    except errors.DeviceUnresponsiveError as e:
-      # Make sure this device is not attached
-      logging.warning(e)
-      if android_commands.IsDeviceAttached(self.device):
-        raise
     finally:
       self.CleanupSpawningServerState()
     # Calculate unknown test results.
     all_tests = set(test.split(':'))
     all_tests_ran = set([t.GetName() for t in test_results.GetAll()])
     unknown_tests = all_tests - all_tests_ran
     test_results.AddResults(
         [base_test_result.BaseTestResult(t, base_test_result.ResultType.UNKNOWN)
          for t in unknown_tests])
     retry = ':'.join([t.GetName() for t in test_results.GetNotPass()])
     return test_results, retry
 
   #override
   def SetUp(self):
     """Sets up necessary test enviroment for the test suite."""
     super(TestRunner, self).SetUp()
     if _TestSuiteRequiresMockTestServer(self.test_package.test_suite_basename):
       self.LaunchChromeTestServerSpawner()
     self.tool.SetupEnvironment()
 
   #override
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     self.tool.CleanUpEnvironment()
     if self._cleanup_test_files:
       self.adb.RemovePushedFiles()
     super(TestRunner, self).TearDown()