| Index: build/android/pylib/local/device/local_device_gtest_run.py
|
| diff --git a/build/android/pylib/local/device/local_device_gtest_run.py b/build/android/pylib/local/device/local_device_gtest_run.py
|
| index e740f564a23cdb8cb8c52aac216b99421a1d977d..f81019e5aeafb586a9a8eed8b4cc5b8405c08968 100644
|
| --- a/build/android/pylib/local/device/local_device_gtest_run.py
|
| +++ b/build/android/pylib/local/device/local_device_gtest_run.py
|
| @@ -315,8 +315,11 @@ class LocalDeviceGtestRun(local_device_test_run.LocalDeviceTestRun):
|
|
|
| # Query all devices in case one fails.
|
| test_lists = self._env.parallel_devices.pMap(list_tests).pGet(None)
|
| - # TODO(agrieve): Make this fail rather than return an empty list when
|
| - # all devices fail.
|
| +
|
| + # If all devices failed to list tests, raise an exception.
|
| + if all([tl is None for tl in test_lists]):
|
| + raise device_errors.CommandFailedError(
|
| + 'Failed to list tests on any device')
|
| return list(sorted(set().union(*[set(tl) for tl in test_lists if tl])))
|
|
|
| #override
|
|
|