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

build/android/pylib/base/base_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 contextlib
 import httplib
 import logging
 import os
 import tempfile
 import time
@@ skipping 148 matching lines @@
     # proper hand-shake/shutdown.
     Forwarder.KillDevice(self.adb, self.tool)
     if self._forwarder:
       self._forwarder.Close()
     if self._http_server:
       self._http_server.ShutdownHttpServer()
     if self._spawning_server:
       self._spawning_server.Stop()
     self.flags.Restore()
 
+  def CleanupAfterEachTest(self):

[craigdh, 2013/03/08 19:50:42]

This name is a bit misleading as it's only used by gtests. How about naming it
something like CleanupTestServer() and adding a docstring explaining when it
should be called.

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

Since test server is something internal to spawning server, I am renaming this
to cleanupSpawningServerState.

+    if self._spawning_server:
+      self._spawning_server.CleanupTestServer()
+
   def LaunchChromeTestServerSpawner(self):
     """Launches test server spawner."""
     server_ready = False
     error_msgs = []
     # Try 3 times to launch test spawner server.
     for i in xrange(0, 3):
       # Do not allocate port for test server here. We will allocate
       # different port for individual test in TestServerThread.
       self.test_server_spawner_port = ports.AllocateTestServerPort()
       self._spawning_server = SpawningServer(self.test_server_spawner_port,
@@ skipping 12 matching lines @@
       # Wait for 2 seconds then restart.
       time.sleep(2)
     if not server_ready:
       logging.error(';'.join(error_msgs))
       raise Exception('Can not start the test spawner server.')
     self._PushTestServerPortInfoToDevice()
     self._spawner_forwarder = self._CreateAndRunForwarder(
         self.adb,
         [(self.test_server_spawner_port, self.test_server_spawner_port)],
         self.tool, '127.0.0.1', self.build_type)