| Index: build/android/pylib/host_driven/test_runner.py
|
| diff --git a/build/android/pylib/host_driven/test_runner.py b/build/android/pylib/host_driven/test_runner.py
|
| index 865be20bfd2b565c84054ec240b8efcffdb6a06d..5e175bc587345e56d427bd2cc1ce9f04167599f0 100644
|
| --- a/build/android/pylib/host_driven/test_runner.py
|
| +++ b/build/android/pylib/host_driven/test_runner.py
|
| @@ -47,23 +47,27 @@ class HostDrivenTestRunner(base_test_runner.BaseTestRunner):
|
| result, rather than being re-raised on the main thread.
|
| """
|
|
|
| + # TODO(jbudorick): Remove cleanup_test_files once it's no longer used.
|
| + # pylint: disable=unused-argument
|
| #override
|
| - def __init__(self, device, shard_index, tool, cleanup_test_files):
|
| + def __init__(self, device, shard_index, tool, cleanup_test_files=None):
|
| """Creates a new HostDrivenTestRunner.
|
|
|
| Args:
|
| device: Attached android device.
|
| shard_index: Shard index.
|
| tool: Name of the Valgrind tool.
|
| - cleanup_test_files: Whether or not to cleanup test files on device.
|
| + cleanup_test_files: Deprecated.
|
| """
|
|
|
| - super(HostDrivenTestRunner, self).__init__(device, tool, cleanup_test_files)
|
| + super(HostDrivenTestRunner, self).__init__(device, tool)
|
|
|
| # The shard index affords the ability to create unique port numbers (e.g.
|
| # DEFAULT_PORT + shard_index) if the test so wishes.
|
| self.shard_index = shard_index
|
|
|
| + # pylint: enable=unused-argument
|
| +
|
| #override
|
| def RunTest(self, test):
|
| """Sets up and runs a test case.
|
| @@ -82,7 +86,7 @@ class HostDrivenTestRunner(base_test_runner.BaseTestRunner):
|
| exception_raised = False
|
|
|
| try:
|
| - test.SetUp(str(self.device), self.shard_index, self._cleanup_test_files)
|
| + test.SetUp(str(self.device), self.shard_index)
|
| except Exception:
|
| logging.exception(
|
| 'Caught exception while trying to run SetUp() for test: ' +
|
|
|