| Index: build/android/pylib/remote/device/remote_device_gtest_run.py
|
| diff --git a/build/android/pylib/remote/device/remote_device_gtest_run.py b/build/android/pylib/remote/device/remote_device_gtest_run.py
|
| deleted file mode 100644
|
| index 07a8108b5bda0d8b043a404f433092fa13c1b50d..0000000000000000000000000000000000000000
|
| --- a/build/android/pylib/remote/device/remote_device_gtest_run.py
|
| +++ /dev/null
|
| @@ -1,89 +0,0 @@
|
| -# Copyright 2014 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.
|
| -
|
| -"""Run specific test on specific environment."""
|
| -
|
| -import logging
|
| -import os
|
| -import tempfile
|
| -
|
| -from pylib import constants
|
| -from pylib.base import base_test_result
|
| -from pylib.gtest import gtest_test_instance
|
| -from pylib.remote.device import remote_device_test_run
|
| -
|
| -
|
| -_EXTRA_COMMAND_LINE_FILE = (
|
| - 'org.chromium.native_test.NativeTest.CommandLineFile')
|
| -
|
| -
|
| -class RemoteDeviceGtestTestRun(remote_device_test_run.RemoteDeviceTestRun):
|
| - """Run gtests and uirobot tests on a remote device."""
|
| -
|
| - DEFAULT_RUNNER_PACKAGE = (
|
| - 'org.chromium.native_test.NativeTestInstrumentationTestRunner')
|
| -
|
| - #override
|
| - def TestPackage(self):
|
| - return self._test_instance.suite
|
| -
|
| - #override
|
| - def _TriggerSetUp(self):
|
| - """Set up the triggering of a test run."""
|
| - logging.info('Triggering test run.')
|
| -
|
| - if self._env.runner_type:
|
| - logging.warning('Ignoring configured runner_type "%s"',
|
| - self._env.runner_type)
|
| -
|
| - if not self._env.runner_package:
|
| - runner_package = self.DEFAULT_RUNNER_PACKAGE
|
| - logging.info('Using default runner package: %s',
|
| - self.DEFAULT_RUNNER_PACKAGE)
|
| - else:
|
| - runner_package = self._env.runner_package
|
| -
|
| - dummy_app_path = os.path.join(
|
| - constants.GetOutDirectory(), 'apks', 'remote_device_dummy.apk')
|
| -
|
| - # pylint: disable=protected-access
|
| - with tempfile.NamedTemporaryFile(suffix='.flags.txt') as flag_file:
|
| - env_vars = dict(self._test_instance.extras)
|
| - if gtest_test_instance.EXTRA_SHARD_NANO_TIMEOUT not in env_vars:
|
| - env_vars[gtest_test_instance.EXTRA_SHARD_NANO_TIMEOUT] = int(
|
| - self._test_instance.shard_timeout * 1e9)
|
| -
|
| - flags = []
|
| -
|
| - filter_string = self._test_instance._GenerateDisabledFilterString(None)
|
| - if filter_string:
|
| - flags.append('--gtest_filter=%s' % filter_string)
|
| -
|
| - if self._test_instance.test_arguments:
|
| - flags.append(self._test_instance.test_arguments)
|
| -
|
| - if flags:
|
| - flag_file.write('_ ' + ' '.join(flags))
|
| - flag_file.flush()
|
| - env_vars[_EXTRA_COMMAND_LINE_FILE] = os.path.basename(flag_file.name)
|
| - self._test_instance._data_deps.append(
|
| - (os.path.abspath(flag_file.name), None))
|
| - self._AmInstrumentTestSetup(
|
| - dummy_app_path, self._test_instance.apk, runner_package,
|
| - environment_variables=env_vars)
|
| -
|
| - _INSTRUMENTATION_STREAM_LEADER = 'INSTRUMENTATION_STATUS: stream='
|
| -
|
| - #override
|
| - def _ParseTestResults(self):
|
| - logging.info('Parsing results from stdout.')
|
| - results = base_test_result.TestRunResults()
|
| - output = self._results['results']['output'].splitlines()
|
| - output = (l[len(self._INSTRUMENTATION_STREAM_LEADER):] for l in output
|
| - if l.startswith(self._INSTRUMENTATION_STREAM_LEADER))
|
| - results_list = gtest_test_instance.ParseGTestOutput(output)
|
| - results.AddResults(results_list)
|
| -
|
| - self._DetectPlatformErrors(results)
|
| - return results
|
|
|