[Android] Add --skip-deps-push to test scripts.

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.
 
 """Base class for running tests on a single device."""
 
 import contextlib
 import httplib
 import logging
 import os
@@ skipping 16 matching lines @@
 NET_TEST_SERVER_PORT_INFO_FILE = 'net-test-server-ports'
 
 
 class BaseTestRunner(object):
   """Base class for running tests on a single device.
 
   A subclass should implement RunTests() with no parameter, so that calling
   the Run() method will set up tests, run them and tear them down.
   """
 
-  def __init__(self, device, tool, build_type):
+  def __init__(self, device, tool, build_type, push_deps):
     """
       Args:
         device: Tests will run on the device of this ID.
         shard_index: Index number of the shard on which the test suite will run.
         build_type: 'Release' or 'Debug'.
+        push_deps: If True, push all dependencies to the device.
     """
     self.device = device
     self.adb = android_commands.AndroidCommands(device=device)
     self.tool = CreateTool(tool, self.adb)
     self._http_server = None
     self._forwarder = None
     self._forwarder_device_port = 8000
     self.forwarder_base_url = ('http://localhost:%d' %
         self._forwarder_device_port)
     self.flags = FlagChanger(self.adb)
     self.flags.AddFlags(['--disable-fre'])
     self._spawning_server = None
     self._spawner_forwarder = None
     # We will allocate port for test server spawner when calling method
     # LaunchChromeTestServerSpawner and allocate port for test server when
     # starting it in TestServerThread.
     self.test_server_spawner_port = 0
     self.test_server_port = 0
     self.build_type = build_type
+    self._push_deps = push_deps
 
   def _PushTestServerPortInfoToDevice(self):
     """Pushes the latest port information to device."""
     self.adb.SetFileContents(self.adb.GetExternalStorage() + '/' +
                              NET_TEST_SERVER_PORT_INFO_FILE,
                              '%d:%d' % (self.test_server_spawner_port,
                                         self.test_server_port))
 
   def RunTest(self, test):
     """Runs a test. Needs to be overridden.
 
     Args:
       test: A test to run.
 
     Returns:
       Tuple containing:
         (base_test_result.TestRunResults, tests to rerun or None)
     """
     raise NotImplementedError
 
   def PushDependencies(self):
     """Push all dependencies 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)
-    self.PushDependencies()
+    if self._push_deps:
+      logging.info('Pushing deps to device.')
+      self.PushDependencies()

[nilesh, 2013/06/12 17:25:12]

This causes the apk install to be skipped as well. I dont think skipping the apk
install was intended. Was it?

+    else:
+      logging.warning('Skipping pushing deps to device.')
 
   def TearDown(self):
     """Run once after all tests are run."""
     self.ShutdownHelperToolsForTestSuite()
 
   def CopyTestData(self, test_data_paths, dest_dir):
     """Copies |test_data_paths| list of files/directories to |dest_dir|.
 
     Args:
       test_data_paths: A list of files or directories relative to |dest_dir|
@@ skipping 104 matching lines @@
         break
       else:
         error_msgs.append(error_msg)
       self._spawning_server.Stop()
       # 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()