Cleanup test server instance after running each a test in gtest test runner

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
 
 from pylib import android_commands
 from pylib import constants
@@ skipping 253 matching lines @@
       if android_commands.IsDeviceAttached(self.device):
         raise
     # Calculate unknown test results.
     # TODO(frankf): Do not break TestResults encapsulation.
     all_tests = set(test.split(':'))
     all_tests_ran = set([t.name for t in test_results.GetAll()])
     unknown_tests = all_tests - all_tests_ran
     test_results.unknown = [test_result.BaseTestResult(t, '') for t in
                             unknown_tests]
     retry = ':'.join([t.name for t in test_results.GetAllBroken()])
+    self.CleanupAfterEachTest()

[craigdh, 2013/03/08 19:53:08]

Should this be in a finally block attached to the above try block?

[nilesh, 2013/03/08 23:37:52]

Done.

     return test_results, retry
 
   #override
   def SetUp(self):
     """Sets up necessary test enviroment for the test suite."""
     super(TestRunner, self).SetUp()
     self.StripAndCopyFiles()
     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()