fix test broken issue when using --use-emulator

build/android/pylib/single_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 logging
 import os
 import sys
 
 from base_test_runner import BaseTestRunner
 import debug_info
 import run_tests_helper
 from test_package_apk import TestPackageApk
 from test_package_executable import TestPackageExecutable
 from test_result import TestResults
 
+# adb_interface.py is under ../../third_party/android_testrunner/
+sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), '..',
+   '..', 'third_party', 'android_testrunner'))
+import run_command
+
 
 class SingleTestRunner(BaseTestRunner):
   """Single test suite attached to a single device.
 
   Args:
     device: Device to run the tests.
     test_suite: A specific test suite to run, empty to run all.
     gtest_filter: A gtest_filter flag.
     test_arguments: Additional arguments to pass to the test binary.
     timeout: Timeout for each test.
@@ skipping 259 matching lines @@
       if not self._gtest_filter:
         self._gtest_filter = ('-' + ':'.join(self.GetDisabledTests()) + ':' +
                              ':'.join(['*.' + x + '*' for x in
                                      self.test_package.GetDisabledPrefixes()]))
       self.RunTestsWithFilter()
     return self.test_results
 
   def SetUp(self):
     """Sets up necessary test enviroment for the test suite."""
     super(SingleTestRunner, self).SetUp()
+    # Sometimes adb server may crash and the connection to the device lost,
+    # which will block the test. So kill the server each time the test starts
+    # and the connection to the device will be re-established.
+    run_command.RunCommand('adb kill-server')

[John Grabowski, 2012/07/10 06:14:09]

prefer self.adb.SomethingOrOther() to a 'run command'.
I believe there is a KillServer() or RestartServer() function already.
If not, add one.

[Wei James(wistoch), 2012/07/10 14:26:48]

fixed. 

define Start/Kill/RestartAdbServer in adb_interface.py and use
RestartAdbServer() here. thanks 

+
     if self.test_package.performance_test:
       if run_tests_helper.IsRunningAsBuildbot():
         self.adb.SetJavaAssertsEnabled(enable=False)
         self.adb.Reboot(full_reboot=False)
       self.adb.SetupPerformanceTest()
     if self.dump_debug_info:
       self.dump_debug_info.StartRecordingLog(True)
     self.StripAndCopyFiles()
     self.LaunchHelperToolsForTestSuite()
     self.test_package.tool.SetupEnvironment()
 
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     self.test_package.tool.CleanUpEnvironment()
     if self.test_package.cleanup_test_files:
       self.adb.RemovePushedFiles()
     if self.dump_debug_info:
       self.dump_debug_info.StopRecordingLog()
     if self.test_package.performance_test:
       self.adb.TearDownPerformanceTest()
     super(SingleTestRunner, self).TearDown()