build/android/pylib/instrumentation/instrumentation_test_instance.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/instrumentation/instrumentation_test_instance.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/instrumentation_parser.py ('k') | build/android/pylib/instrumentation/json_perf_parser.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/pylib/instrumentation/instrumentation_test_instance.py

diff --git a/build/android/pylib/instrumentation/instrumentation_test_instance.py b/build/android/pylib/instrumentation/instrumentation_test_instance.py

index 10ed63bdc5d178a7eeab39fb98886ad816246b0f..3da36df108239979adebde67f109b4fb517bd4e5 100644

--- a/build/android/pylib/instrumentation/instrumentation_test_instance.py

+++ b/build/android/pylib/instrumentation/instrumentation_test_instance.py

@@ -10,9 +10,7 @@ import sys

from devil.android import apk_helper

from devil.android import md5sum

-from devil.utils import cmd_helper

from pylib import constants

-from pylib import flag_changer

from pylib.base import base_test_result

from pylib.base import test_instance

from pylib.instrumentation import test_result

@@ -21,7 +19,7 @@ from pylib.utils import proguard

sys.path.append(

os.path.join(constants.DIR_SOURCE_ROOT, 'build', 'util', 'lib', 'common'))

-import unittest_util

+import unittest_util # pylint: disable=import-error

# Ref: http://developer.android.com/reference/android/app/Activity.html

_ACTIVITY_RESULT_CANCELED = 0

@@ -359,7 +357,7 @@ class InstrumentationTestInstance(test_instance.TestInstance):

try:

tests = self._GetTestsFromPickle(pickle_path, self.test_jar)

except self.ProguardPickleException as e:

- logging.info('Getting tests from JAR via proguard. (%s)' % str(e))

+ logging.info('Getting tests from JAR via proguard. (%s)', str(e))

tests = self._GetTestsFromProguard(self.test_jar)

self._SaveTestsToPickle(pickle_path, self.test_jar, tests)

return self._InflateTests(self._FilterTests(tests))

@@ -388,6 +386,7 @@ class InstrumentationTestInstance(test_instance.TestInstance):

logging.error(pickle_data)

raise self.ProguardPickleException(str(e))

+ # pylint: disable=no-self-use

def _GetTestsFromProguard(self, jar_path):

p = proguard.Dump(jar_path)