Relands Android perf tests: kill adbd on the device after running a test.

build/android/pylib/perf/test_runner.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.
 
 """Runs perf tests.
 
 Our buildbot infrastructure requires each slave to run steps serially.
 This is sub-optimal for android, where these steps can run independently on
 multiple connected devices.
 
@@ skipping 30 matching lines @@
   --device: the serial number to be passed to all adb commands.
 """
 
 import datetime
 import logging
 import os
 import pickle
 import sys
 
 from pylib import constants
+from pylib import forwarder
 from pylib import pexpect
 from pylib.base import base_test_result
 from pylib.base import base_test_runner
 
 
 def PrintTestOutput(test_name):
   """Helper method to print the output of previously executed test_name.
 
   Args:
     test_name: name of the test that has been previously executed.
@@ skipping 53 matching lines @@
 
   def _LaunchPerfTest(self, test_name):
     """Runs a perf test.
 
     Args:
       test_name: the name of the test to be executed.
 
     Returns:
       A tuple containing (Output, base_test_result.ResultType)
     """
+    try:
+      logging.warning('Unmapping device ports')
+      forwarder.Forwarder.UnmapAllDevicePorts(self.adb)
+      self.adb.RestartAdbdOnDevice()
+    except Exception as e:
+      logging.error('Exception when tearing down device %s', e)
+
     cmd = ('%s --device %s' %
            (self._tests[test_name], self.device))
     logging.info('%s : %s', test_name, cmd)
     start_time = datetime.datetime.now()
 
     timeout = 1800
     if self._options.no_timeout:
       timeout = None
     full_cmd = cmd
     if self._options.dry_run:
@@ skipping 43 matching lines @@
     Returns:
       A tuple of (TestRunResults, retry).
     """
     output, result_type = self._LaunchPerfTest(test_name)
     results = base_test_result.TestRunResults()
     results.AddResult(base_test_result.BaseTestResult(test_name, result_type))
     retry = None
     if not results.DidRunPass():
       retry = test_name
     return results, retry