Add test_server_setup.py and add support for additional flags.

build/android/pylib/host_driven/test_case.py

 # Copyright 2013 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 host-driven test cases.
 
 This test case is intended to serve as the base class for any host-driven
 test cases. It is similar to the Python unitttest module in that test cases
 inherit from this class and add methods which will be run as tests.
 
@@ skipping 59 matching lines @@
 
   def GetOutDir(self):
     return os.path.join(os.environ['CHROME_SRC'], 'out',
                         constants.GetBuildType())
 
   def Run(self):
     logging.info('Running host-driven test: %s', self.tagged_name)
     # Get the test method on the derived class and execute it
     return getattr(self, self.test_name)()
 
-  def __RunJavaTest(self, test, test_pkg):
+  def __RunJavaTest(self, test, test_pkg, additional_flags=None):
     """Runs a single Java test in a Java TestRunner.
 
     Args:
       test: Fully qualified test name (ex. foo.bar.TestClass#testMethod)
       test_pkg: TestPackage object.
+      additional_flags: A list of additional flags to add to the command line.
 
     Returns:
       TestRunResults object with a single test result.
     """
     java_test_runner = test_runner.TestRunner(self.instrumentation_options,
                                               self.device_id,
                                               self.shard_index, test_pkg,
-                                              self.ports_to_forward)
+                                              self.ports_to_forward,
+                                              additional_flags=additional_flags)
     try:
       java_test_runner.SetUp()
       return java_test_runner.RunTest(test)[0]
     finally:
       java_test_runner.TearDown()
 
-  def _RunJavaTestFilters(self, test_filters):
+  def _RunJavaTestFilters(self, test_filters, additional_flags=None):
     """Calls a list of tests and stops at the first test failure.
 
     This method iterates until either it encounters a non-passing test or it
     exhausts the list of tests. Then it returns the appropriate overall result.
 
     Test cases may make use of this method internally to assist in running
     instrumentation tests. This function relies on instrumentation_options
     being defined.
 
     Args:
       test_filters: A list of Java test filters.
+      additional_flags: A list of addition flags to add to the command line.
 
     Returns:
       A TestRunResults object containing an overall result for this set of Java
       tests. If any Java tests do not pass, this is a fail overall.
     """
     test_type = base_test_result.ResultType.PASS
     log = ''
 
     test_pkg = test_package.TestPackage(
         self.instrumentation_options.test_apk_path,
         self.instrumentation_options.test_apk_jar_path)
 
     start_ms = int(time.time()) * 1000
     done = False
     for test_filter in test_filters:
       tests = test_pkg._GetAllMatchingTests(None, None, test_filter)
       # Filters should always result in >= 1 test.
       if len(tests) == 0:
         raise Exception('Java test filter "%s" returned no tests.'
                         % test_filter)
       for test in tests:
         # We're only running one test at a time, so this TestRunResults object
         # will hold only one result.
-        java_result = self.__RunJavaTest(test, test_pkg)
+        java_result = self.__RunJavaTest(test, test_pkg, additional_flags)
         assert len(java_result.GetAll()) == 1
         if not java_result.DidRunPass():
           result = java_result.GetNotPass().pop()
           log = result.GetLog()
           test_type = result.GetType()
           done = True
           break
       if done:
         break
     duration_ms = int(time.time()) * 1000 - start_ms
 
     overall_result = base_test_result.TestRunResults()
     overall_result.AddResult(
         test_result.InstrumentationTestResult(
             self.tagged_name, test_type, start_ms, duration_ms, log=log))
     return overall_result
 
   def __str__(self):
     return self.tagged_name
 
   def __repr__(self):
     return self.tagged_name