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

Side by Side Diff: build/android/pylib/utils/test_environment.py

Issue 2029833003: [Android] Attempt to continue on timeout in perf test runner setup. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 logging 5 import logging
6 import psutil 6 import psutil
7 import signal 7 import signal
8 8
9 from devil.android import device_errors 9 from devil.android import device_errors
10 from devil.android import device_utils 10 from devil.android import device_utils
(...skipping 27 matching lines...) Expand all
38 """ 38 """
39 _KillWebServers() 39 _KillWebServers()
40 device_utils.RestartServer() 40 device_utils.RestartServer()
41 41
42 def cleanup_device(d): 42 def cleanup_device(d):
43 try: 43 try:
44 d.WaitUntilFullyBooted() 44 d.WaitUntilFullyBooted()
45 d.RestartAdbd() 45 d.RestartAdbd()
46 d.EnableRoot() 46 d.EnableRoot()
47 d.WaitUntilFullyBooted() 47 d.WaitUntilFullyBooted()
48 except device_errors.CommandFailedError: 48 except (device_errors.CommandFailedError,
49 device_errors.CommandTimeoutError):
49 logging.exception('Failed to clean up device. Attempting to continue.') 50 logging.exception('Failed to clean up device. Attempting to continue.')
50 51
51 device_utils.DeviceUtils.parallel(devices).pMap(cleanup_device) 52 device_utils.DeviceUtils.parallel(devices).pMap(cleanup_device)
52 53
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