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

Unified Diff: build/android/pylib/instrumentation/test_runner.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/instrumentation/test_jar.py ('k') | build/android/pylib/junit/test_dispatcher.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/instrumentation/test_runner.py
diff --git a/build/android/pylib/instrumentation/test_runner.py b/build/android/pylib/instrumentation/test_runner.py
index 938344190705c4dcc5f47ec7ae63a1c849112de5..8131e0712b297993a8cb2e73da1d3ca1a5e9a728 100644
--- a/build/android/pylib/instrumentation/test_runner.py
+++ b/build/android/pylib/instrumentation/test_runner.py
@@ -274,12 +274,13 @@ class TestRunner(base_test_runner.BaseTestRunner):
try:
timeout_scale = int(annotations['TimeoutScale'])
except ValueError:
- logging.warning('Non-integer value of TimeoutScale ignored. (%s)'
- % annotations['TimeoutScale'])
+ logging.warning('Non-integer value of TimeoutScale ignored. (%s)',
+ annotations['TimeoutScale'])
if self.options.wait_for_debugger:
timeout_scale *= 100
return timeout_scale
+ # pylint: disable=too-many-return-statements
def _GetIndividualTestTimeoutSecs(self, test):
"""Returns the timeout in seconds for the given |test|."""
annotations = self.test_pkg.GetTestAnnotations(test)
@@ -298,8 +299,8 @@ class TestRunner(base_test_runner.BaseTestRunner):
if 'SmallTest' in annotations:
return 1 * 60
- logging.warn(("Test size not found in annotations for test '%s', using " +
- "1 minute for timeout.") % test)
+ logging.warn("Test size not found in annotations for test '%s', using " +
+ "1 minute for timeout.", test)
return 1 * 60
def _RunTest(self, test, timeout):
@@ -318,6 +319,7 @@ class TestRunner(base_test_runner.BaseTestRunner):
'%s/%s' % (self.test_pkg.GetPackageName(), self.options.test_runner),
raw=True, extras=extras, timeout=timeout, retries=3)
+ # pylint: disable=no-self-use
def _GenerateTestResult(self, test, instr_result_code, instr_result_bundle,
statuses, start_ms, duration_ms):
results = instrumentation_test_instance.GenerateTestResults(
« no previous file with comments | « build/android/pylib/instrumentation/test_jar.py ('k') | build/android/pylib/junit/test_dispatcher.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698