Updates the test runner script exit codes

build/android/pylib/gtest/test_runner.py

Index: build/android/pylib/gtest/test_runner.py
diff --git a/build/android/pylib/gtest/test_runner.py b/build/android/pylib/gtest/test_runner.py
index a487214797c89ac1540db78fea807c1c67a8bfba..f50ea952ed7841fe1b205e810fe590d42eb8c24e 100644
--- a/build/android/pylib/gtest/test_runner.py
+++ b/build/android/pylib/gtest/test_runner.py
@@ -7,11 +7,8 @@ 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
@@ -25,12 +22,12 @@ 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')
 
@@ -55,14 +52,14 @@ def _GetDataFilesForTestSuite(product_dir, test_suite_basename):
         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(),
@@ -155,11 +152,11 @@ def _GetDataFilesForTestSuite(product_dir, test_suite_basename):
         ]
   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 [
@@ -342,7 +339,7 @@ class TestRunner(base_test_runner.BaseTestRunner):
         '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(
@@ -359,11 +356,6 @@ class TestRunner(base_test_runner.BaseTestRunner):
       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.