[Android] Separate concepts of pushing test data and installing test apk.

build/android/pylib/base/base_test_runner.py

Index: build/android/pylib/base/base_test_runner.py
diff --git a/build/android/pylib/base/base_test_runner.py b/build/android/pylib/base/base_test_runner.py
index 0af5f502b1396314aedb5aac5261b10d3def043d..8576f84f5f97026de776ab6f58eef1301c6ebf60 100644
--- a/build/android/pylib/base/base_test_runner.py
+++ b/build/android/pylib/base/base_test_runner.py
@@ -81,18 +81,23 @@ class BaseTestRunner(object):
     """
     raise NotImplementedError
 
-  def PushDependencies(self):
-    """Push all dependencies to device once before all tests are run."""
+  def InstallTestPackage(self):
+    """Installs the test package once before all tests are run."""
+    pass
+
+  def PushDataDeps(self):
+    """Push all data deps to device once before all tests are run."""
     pass
 
   def SetUp(self):
     """Run once before all tests are run."""
     Forwarder.KillDevice(self.adb, self.tool)
     if self._push_deps:
-      logging.info('Pushing deps to device.')
-      self.PushDependencies()
+      logging.info('Pushing data deps to device.')
+      self.PushDataDeps()
     else:
-      logging.warning('Skipping pushing deps to device.')
+      logging.warning('Skipping pushing data deps to device.')
+    self.InstallTestPackage()

[nilesh, 2013/06/12 20:07:45]

This should be called before PushDataDeps to maintain old behavior (however the
behavior was different for instrumentation tests).
 
Also, run_python_tests called InstallTestPackage first. Lets just make this
consistent across all test types.

[frankf, 2013/06/12 20:53:56]

Done.

 
   def TearDown(self):
     """Run once after all tests are run."""