Changes argument passing to use options objects

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
 from pylib import pexpect
 from pylib.base import base_test_result
 from pylib.base import base_test_runner
 
 
 def _TestSuiteRequiresMockTestServer(suite_name):
   """Returns True if the test suite requires mock test server."""
   tests_require_net_test_server = ['unit_tests', 'net_unittests',
                                    'content_unittests',
                                    'content_browsertests']
   return (suite_name in
           tests_require_net_test_server)
 
 
 class TestRunner(base_test_runner.BaseTestRunner):
-  def __init__(self, device, test_package, test_arguments, timeout,
-               cleanup_test_files, tool_name, build_type, push_deps):
+  def __init__(self, test_options, device, test_package):
     """Single test suite attached to a single device.
 
     Args:
+      test_options: A GTestOptions object containing the set of options
+          relevant to running instrumentation tests.
       device: Device to run the tests.
       test_package: An instance of TestPackage class.
-      test_arguments: Additional arguments to pass to the test binary.
-      timeout: Timeout for each test.
-      cleanup_test_files: Whether or not to cleanup test files on device.
-      tool_name: Name of the Valgrind tool.
-      build_type: 'Release' or 'Debug'.
-      push_deps: If True, push all dependencies to the device.
     """
-    super(TestRunner, self).__init__(device, tool_name, build_type, push_deps,
-                                     cleanup_test_files)
+
+    super(TestRunner, self).__init__(device, test_options.tool,
+                                     test_options.build_type,
+                                     test_options.push_deps,
+                                     test_options.cleanup_test_files)
+
     self.test_package = test_package
     self.test_package.tool = self.tool
-    self._test_arguments = test_arguments
+    self._test_arguments = test_options.test_arguments
+
+    timeout = test_options.timeout
     if timeout == 0:
       timeout = 60
     # On a VM (e.g. chromium buildbots), this timeout is way too small.
     if os.environ.get('BUILDBOT_SLAVENAME'):
       timeout = timeout * 2
+
     self._timeout = timeout * self.tool.GetTimeoutScale()
 
   #override
   def InstallTestPackage(self):
     self.test_package.Install(self.adb)
 
   def GetAllTests(self):
     """Install test package and get a list of all tests."""
     self.test_package.Install(self.adb)
     return self.test_package.GetAllTests(self.adb)
@@ skipping 122 matching lines @@
     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."""
     self.tool.CleanUpEnvironment()
     super(TestRunner, self).TearDown()