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

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

Issue 2760923002: [build/android] Fix device.RunShellCommand usages (Closed)
Patch Set: Created 3 years, 9 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
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 os 6 import os
7 import posixpath 7 import posixpath
8 import re 8 import re
9 import time 9 import time
10 10
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 device.ClearApplicationState(self._test_instance.package_info.package, 373 device.ClearApplicationState(self._test_instance.package_info.package,
374 permissions=permissions) 374 permissions=permissions)
375 375
376 else: 376 else:
377 logging.debug('raw output from %s:', test_display_name) 377 logging.debug('raw output from %s:', test_display_name)
378 for l in output: 378 for l in output:
379 logging.debug(' %s', l) 379 logging.debug(' %s', l)
380 if self._test_instance.coverage_directory: 380 if self._test_instance.coverage_directory:
381 device.PullFile(coverage_directory, 381 device.PullFile(coverage_directory,
382 self._test_instance.coverage_directory) 382 self._test_instance.coverage_directory)
383 device.RunShellCommand('rm -f %s' % os.path.join(coverage_directory, 383 device.RunShellCommand(
384 '*')) 384 'rm -f %s' % posixpath.join(coverage_directory, '*'),
385 check_return=True, shell=True)
perezju 2017/03/20 15:22:58 This appears to be sort of common-ish, wondering w
jbudorick 2017/03/20 15:27:02 Maybe an addition to https://codesearch.chromium.o
385 if self._test_instance.store_tombstones: 386 if self._test_instance.store_tombstones:
386 tombstones_url = None 387 tombstones_url = None
387 for result in results: 388 for result in results:
388 if result.GetType() == base_test_result.ResultType.CRASH: 389 if result.GetType() == base_test_result.ResultType.CRASH:
389 if not tombstones_url: 390 if not tombstones_url:
390 resolved_tombstones = tombstones.ResolveTombstones( 391 resolved_tombstones = tombstones.ResolveTombstones(
391 device, 392 device,
392 resolve_all_tombstones=True, 393 resolve_all_tombstones=True,
393 include_stack_symbols=False, 394 include_stack_symbols=False,
394 wipe_tombstones=True) 395 wipe_tombstones=True)
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 if k in annotations: 429 if k in annotations:
429 timeout = v 430 timeout = v
430 break 431 break
431 else: 432 else:
432 logging.warning('Using default 1 minute timeout for %s', test_name) 433 logging.warning('Using default 1 minute timeout for %s', test_name)
433 timeout = 60 434 timeout = 60
434 435
435 timeout *= cls._GetTimeoutScaleFromAnnotations(annotations) 436 timeout *= cls._GetTimeoutScaleFromAnnotations(annotations)
436 437
437 return timeout 438 return timeout
438
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698