Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(581)

Side by Side Diff: build/android/pylib/local/device/local_device_gtest_run.py

Issue 1417873004: Android Gtest Runner: Increase test list timeout from 10s -> 20s (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import imp 5 import imp
6 import itertools 6 import itertools
7 import os 7 import os
8 import posixpath 8 import posixpath
9 9
10 from devil.android import device_errors 10 from devil.android import device_errors
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 if tests: 309 if tests:
310 return tests 310 return tests
311 311
312 # Even when there's only one device, it still makes sense to retrieve the 312 # Even when there's only one device, it still makes sense to retrieve the
313 # test list so that tests can be split up and run in batches rather than all 313 # test list so that tests can be split up and run in batches rather than all
314 # at once (since test output is not streamed). 314 # at once (since test output is not streamed).
315 @local_device_test_run.handle_shard_failures_with( 315 @local_device_test_run.handle_shard_failures_with(
316 on_failure=self._env.BlacklistDevice) 316 on_failure=self._env.BlacklistDevice)
317 def list_tests(dev): 317 def list_tests(dev):
318 tests = self._delegate.Run( 318 tests = self._delegate.Run(
319 None, dev, flags='--gtest_list_tests', timeout=10) 319 None, dev, flags='--gtest_list_tests', timeout=20)
320 tests = gtest_test_instance.ParseGTestListTests(tests) 320 tests = gtest_test_instance.ParseGTestListTests(tests)
321 tests = self._test_instance.FilterTests(tests) 321 tests = self._test_instance.FilterTests(tests)
322 return tests 322 return tests
323 323
324 # Query all devices in case one fails. 324 # Query all devices in case one fails.
325 test_lists = self._env.parallel_devices.pMap(list_tests).pGet(None) 325 test_lists = self._env.parallel_devices.pMap(list_tests).pGet(None)
326 # TODO(agrieve): Make this fail rather than return an empty list when 326 # TODO(agrieve): Make this fail rather than return an empty list when
327 # all devices fail. 327 # all devices fail.
328 return list(sorted(set().union(*[set(tl) for tl in test_lists if tl]))) 328 return list(sorted(set().union(*[set(tl) for tl in test_lists if tl])))
329 329
(...skipping 24 matching lines...) Expand all
354 def TearDown(self): 354 def TearDown(self):
355 @local_device_test_run.handle_shard_failures 355 @local_device_test_run.handle_shard_failures
356 def individual_device_tear_down(dev): 356 def individual_device_tear_down(dev):
357 for s in self._servers.get(str(dev), []): 357 for s in self._servers.get(str(dev), []):
358 s.TearDown() 358 s.TearDown()
359 359
360 tool = self.GetTool(dev) 360 tool = self.GetTool(dev)
361 tool.CleanUpEnvironment() 361 tool.CleanUpEnvironment()
362 362
363 self._env.parallel_devices.pMap(individual_device_tear_down) 363 self._env.parallel_devices.pMap(individual_device_tear_down)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698