build/android/pylib/local/device/local_device_instrumentation_test_run.py - Issue 1315743004: [Android] Add a custom pylintrc for build/android/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/pylib/local/device/local_device_instrumentation_test_run.py

Issue 1315743004: [Android] Add a custom pylintrc for build/android/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix appurify_sanitized import-errors Created 5 years, 3 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « build/android/pylib/local/device/local_device_environment.py ('k') | build/android/pylib/local/device/local_device_test_run.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/pylib/local/device/local_device_instrumentation_test_run.py

diff --git a/build/android/pylib/local/device/local_device_instrumentation_test_run.py b/build/android/pylib/local/device/local_device_instrumentation_test_run.py

index eacad08d30cfb571586a5be801bce72512db687c..35c2c3f3974c20adaf05f947a3f7df9a642fd800 100644

--- a/build/android/pylib/local/device/local_device_instrumentation_test_run.py

+++ b/build/android/pylib/local/device/local_device_instrumentation_test_run.py

@@ -7,10 +7,8 @@ import re

import time

from devil.android import device_errors

-from devil.android.sdk import keyevent

from pylib import flag_changer

from pylib.base import base_test_result

-from pylib.base import test_run

from pylib.local.device import local_device_test_run

@@ -143,7 +141,7 @@ class LocalDeviceInstrumentationTestRun(

extras['class'] = test_name

timeout = self._GetTimeoutFromAnnotations(test['annotations'], test_name)

- logging.info('preparing to run %s: %s' % (test_name, test))

+ logging.info('preparing to run %s: %s', test_name, test)

time_ms = lambda: int(time.time() * 1e3)

start_ms = time_ms()

@@ -176,8 +174,9 @@ class LocalDeviceInstrumentationTestRun(

for k, v in TIMEOUT_ANNOTATIONS:

if k in annotations:

timeout = v

+ break

else:

- logging.warning('Using default 1 minute timeout for %s' % test_name)

+ logging.warning('Using default 1 minute timeout for %s', test_name)

timeout = 60

try: