build/android/pylib/instrumentation/instrumentation_test_instance_test.py - Issue 1571803002: [Android] Prepare build/android/ for catapult+devil.

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_test.py

Issue 1571803002: [Android] Prepare build/android/ for catapult+devil. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@create-device-library-links

Patch Set: rebase Created 4 years, 11 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_test_instance.py ('k') | build/android/pylib/instrumentation/setup.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index b6787b2465531621ca19693d636970f5e6fd1e61..3837f1f3ab19724d6be25c99eef4fa3968473dbb 100755

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

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

@@ -6,19 +6,14 @@

"""Unit tests for instrumentation.TestRunner."""

-# pylint: disable=W0212

-import os

-import sys

import unittest

-from pylib import constants

from pylib.base import base_test_result

+from pylib.constants import host_paths

from pylib.instrumentation import instrumentation_test_instance

-sys.path.append(os.path.join(

- constants.DIR_SOURCE_ROOT, 'third_party', 'pymock'))

-import mock # pylint: disable=F0401

+with host_paths.SysPath(host_paths.PYMOCK_PATH):

+ import mock # pylint: disable=import-error

class InstrumentationTestInstanceTest(unittest.TestCase):