diff options
3 files changed, 7 insertions, 17 deletions
diff --git a/build/android/pylib/remote/device/remote_device_environment.py b/build/android/pylib/remote/device/remote_device_environment.py index 06c48a7..d055ae0 100644 --- a/build/android/pylib/remote/device/remote_device_environment.py +++ b/build/android/pylib/remote/device/remote_device_environment.py @@ -78,7 +78,8 @@ class RemoteDeviceEnvironment(environment.Environment): self._remote_device_minimum_os = device_json.get( 'remote_device_minimum_os', None) self._remote_device_os = device_json.get('remote_device_os', None) - self._remote_device_timeout = device_json.get('remote_device_timeout', None) + self._remote_device_timeout = device_json.get( + 'remote_device_timeout', None) self._results_path = device_json.get('results_path', None) self._runner_package = device_json.get('runner_package', None) self._runner_type = device_json.get('runner_type', None) @@ -330,12 +331,6 @@ class RemoteDeviceEnvironment(environment.Environment): return self._network_config @property - def only_output_failures(self): - # TODO(jbudorick): Remove this once b/18981674 is fixed. - # If the results zipfile is downloaded we can get the full results. - return not self._results_path - - @property def results_path(self): return self._results_path diff --git a/build/android/pylib/remote/device/remote_device_gtest_run.py b/build/android/pylib/remote/device/remote_device_gtest_run.py index e78d51d..ec747f1 100644 --- a/build/android/pylib/remote/device/remote_device_gtest_run.py +++ b/build/android/pylib/remote/device/remote_device_gtest_run.py @@ -18,10 +18,6 @@ from pylib.remote.device import remote_device_helper _EXTRA_COMMAND_LINE_FILE = ( 'org.chromium.native_test.NativeTestActivity.CommandLineFile') -# TODO(jbudorick): Remove this extra when b/18981674 is fixed. -_EXTRA_ONLY_OUTPUT_FAILURES = ( - 'org.chromium.native_test.NativeTestInstrumentationTestRunner.' - 'OnlyOutputFailures') class RemoteDeviceGtestTestRun(remote_device_test_run.RemoteDeviceTestRun): @@ -61,8 +57,6 @@ class RemoteDeviceGtestTestRun(remote_device_test_run.RemoteDeviceTestRun): 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)) - if self._env.only_output_failures: - env_vars[_EXTRA_ONLY_OUTPUT_FAILURES] = None self._AmInstrumentTestSetup( dummy_app_path, self._test_instance.apk, runner_package, environment_variables=env_vars) @@ -78,8 +72,6 @@ class RemoteDeviceGtestTestRun(remote_device_test_run.RemoteDeviceTestRun): if l.startswith(self._INSTRUMENTATION_STREAM_LEADER)) results_list = self._test_instance.ParseGTestOutput(output) results.AddResults(results_list) - if self._env.only_output_failures: - logging.info('See logcat for more results information.') if not self._results['results']['pass']: results.AddResult(base_test_result.BaseTestResult( 'Remote Service detected error.', diff --git a/build/android/pylib/remote/device/remote_device_test_run.py b/build/android/pylib/remote/device/remote_device_test_run.py index 071aa64..39ffddf 100644 --- a/build/android/pylib/remote/device/remote_device_test_run.py +++ b/build/android/pylib/remote/device/remote_device_test_run.py @@ -188,14 +188,17 @@ class RemoteDeviceTestRun(test_run.TestRun): def _GetRawTestOutput(self): """Returns the test output.""" + # TODO(mikecase): Remove getting results from zip when b/18981674 is fixed. results_zipfile = self._env.results_path if results_zipfile and os.path.exists(results_zipfile): with zipfile.ZipFile(results_zipfile) as z: with z.open(self._RESULTS_FILE, 'r') as r: return r.read() else: - # The results from here are sometimes cut off. Therefore, we prefer - # getting results from the results zipfile if it is availible. + logging.warning( + 'If the results are too long they could be cut off due to an ' + 'appurify bug. Use the --results-path option when running the ' + 'collect step to ensure you download the full results.') return self._results['results']['output'] def _GetTestStatus(self, test_run_id): |