[Android] Clear gtest app's data on tear down.

build/android/pylib/gtest/test_runner.py

Index: build/android/pylib/gtest/test_runner.py
diff --git a/build/android/pylib/gtest/test_runner.py b/build/android/pylib/gtest/test_runner.py
index 70d393c9abf24c076a106390e599fac3e5a1374e..201e1acabc5816c72313c1fc16333d42a7100abb 100644
--- a/build/android/pylib/gtest/test_runner.py
+++ b/build/android/pylib/gtest/test_runner.py
@@ -160,12 +160,17 @@ class TestRunner(base_test_runner.BaseTestRunner):
       return test_results, None
 
     try:
-      self.test_package.ClearApplicationState(self.adb)
       self.test_package.CreateCommandLineFileOnDevice(
           self.adb, test, self._test_arguments)
       test_results = self._ParseTestOutput(
           self.test_package.SpawnTestProcess(self.adb))
     finally:
+      self.test_package.ClearApplicationState(self.adb)

[craigdh, 2013/08/12 16:11:06]

It's now possible the tests start with some application state. Should we clear
both before and after?

[frankf, 2013/08/12 18:17:21]

I removed the precondition assumption. Now we clear the state before each test
and once in the global teardown.

On 2013/08/12 16:11:06, craigdh wrote:

+      # Content shell creates a profile on the sdscard which accumulates cache
+      # files over time.
+      self.adb.RunShellCommand('rm -r ' +
+          os.path.join(self.adb.GetExternalStorage(), 'content_shell'),
+          timeout_time=60 * 2)
       self.CleanupSpawningServerState()
     # Calculate unknown test results.
     all_tests = set(test.split(':'))
@@ -188,10 +193,5 @@ class TestRunner(base_test_runner.BaseTestRunner):
   #override
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
-    # Content shell creates a profile on the sdscard which accumulates cache
-    # files over time.
-    self.adb.RunShellCommand('rm -r ' +
-        os.path.join(self.adb.GetExternalStorage(), 'content_shell'),
-        timeout_time=60 * 2)
     self.tool.CleanUpEnvironment()
     super(TestRunner, self).TearDown()