build/android/devil/android/logcat_monitor_test.py - Issue 1502033002: Revert of [Android] Add a configurable environment for devil/. (RELAND 2)

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/devil/android/logcat_monitor_test.py

Issue 1502033002: Revert of [Android] Add a configurable environment for devil/. (RELAND 2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years 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

Index: build/android/devil/android/logcat_monitor_test.py

diff --git a/build/android/devil/android/logcat_monitor_test.py b/build/android/devil/android/logcat_monitor_test.py

index 923c671b19ef2b5df6618bc43f35a6858d85f418..2b7969c4e745cae26f859ac75672082f656c3650 100755

--- a/build/android/devil/android/logcat_monitor_test.py

+++ b/build/android/devil/android/logcat_monitor_test.py

@@ -6,15 +6,17 @@

# pylint: disable=protected-access

import itertools

+import os

import sys

import unittest

-from devil import devil_env

from devil.android import logcat_monitor

from devil.android.sdk import adb_wrapper

+from pylib import constants

-sys.path.append(devil_env.config.LocalPath('pymock'))

-import mock # pylint: disable=import-error

+sys.path.append(os.path.join(

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

+import mock # pylint: disable=F0401

def _CreateTestLog(raw_logcat=None):

« no previous file with comments | « build/android/devil/android/fastboot_utils_test.py ('k') | build/android/devil/android/md5sum.py » ('j') | no next file with comments »