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

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 logging
 import os
 import re
 
 from pylib import android_commands
 from pylib import constants
@@ skipping 142 matching lines @@
 
     return results
 
   #override
   def RunTest(self, test):
     test_results = base_test_result.TestRunResults()
     if not test:
       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(':'))
     all_tests_ran = set([t.GetName() for t in test_results.GetAll()])
     unknown_tests = all_tests - all_tests_ran
     test_results.AddResults(
         [base_test_result.BaseTestResult(t, base_test_result.ResultType.UNKNOWN)
          for t in unknown_tests])
     retry = ':'.join([t.GetName() for t in test_results.GetNotPass()])
     return test_results, retry
 
   #override
   def SetUp(self):
     """Sets up necessary test enviroment for the test suite."""
     super(TestRunner, self).SetUp()
     if _TestSuiteRequiresMockTestServer(self.test_package.suite_name):
       self.LaunchChromeTestServerSpawner()
     self.tool.SetupEnvironment()
 
   #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()