build/android/pylib/instrumentation/setup.py - Issue 153743008: Revert of Enable presubmit pylint in 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/setup.py

Issue 153743008: Revert of Enable presubmit pylint in build/android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merging with changes to pylib/linker/test_case.py. Created 6 years, 10 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:

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

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

index dd066fb5d5a4a88ffbf176abab8b50c9b1e98df0..dff7a50e7455fff82d099c871a160f3d4044ae86 100644

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

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

@@ -7,8 +7,8 @@

import logging

import os

-from pylib.instrumentation import test_package

-from pylib.instrumentation import test_runner

+import test_package

+import test_runner

def Setup(test_options):

@@ -26,7 +26,7 @@ def Setup(test_options):

test_pkg = test_package.TestPackage(test_options.test_apk_path,

test_options.test_apk_jar_path)

- tests = test_pkg.GetAllMatchingTests(

+ tests = test_pkg._GetAllMatchingTests(

test_options.annotations,

test_options.exclude_annotations,

test_options.test_filter)