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 a perf test on a single device.
 
 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 32 matching lines @@
   reset test server port allocation.
 """
 
 import datetime
 import logging
 import pexpect
 import pickle
 import os
 import sys
 
+from pylib import android_commands
 from pylib import constants
+from pylib import forwarder
 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 82 matching lines @@
         'name': test_name,
         'output': output,
         'exit_code': exit_code,
         'result_type': result_type,
         'total_time': (end_time - start_time).seconds,
         'device': self.device,
         'cmd': cmd,
     }
     self._SaveResult(persisted_result)
 
+    try:
+      logging.warning('Unmapping device ports')
+      forwarder.Forwarder.UnmapAllDevicePorts(self.adb)
+      self.adb.KillAdbdDevice()
+    except Exception as e:
+      logging.error('Exception when tearing down device %s', e)
+
     return (output, result_type)
 
   def RunTest(self, test_name):
     """Run a perf test on the device.
 
     Args:
       test_name: String to use for logging the test result.
 
     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