build/android/devil/utils/mock_calls.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/utils/mock_calls.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/utils/mock_calls.py

diff --git a/build/android/devil/utils/mock_calls.py b/build/android/devil/utils/mock_calls.py

index bc3b54a04ca5426899be7a84f3b16e48bfbdbe3d..59167bacbf1b047c9200e00490917bf02e2b67c4 100644

--- a/build/android/devil/utils/mock_calls.py

+++ b/build/android/devil/utils/mock_calls.py

@@ -6,12 +6,14 @@

A test facility to assert call sequences while mocking their behavior.

"""

+import os

import sys

import unittest

-from devil import devil_env

+from pylib import constants

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

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

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

import mock # pylint: disable=F0401

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