build/android/devil/android/sdk/shared_prefs_test.py - Issue 1316413003: [Android] Add a configurable environment for 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/devil/android/sdk/shared_prefs_test.py

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

Patch Set: dependency_manager implementation 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

« build/android/devil/android/device_utils.py ('K') | « build/android/devil/android/sdk/dexdump.py ('k') | build/android/devil/android/sdk/split_select.py » ('j') | build/android/devil/devil_env.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/devil/android/sdk/shared_prefs_test.py

diff --git a/build/android/devil/android/sdk/shared_prefs_test.py b/build/android/devil/android/sdk/shared_prefs_test.py

index 63d9aeceea6bb149f5c290910953d658fa852bc2..a0508cbfbe66cb4c546d95756e1c35a6a65e9b87 100755

--- a/build/android/devil/android/sdk/shared_prefs_test.py

+++ b/build/android/devil/android/sdk/shared_prefs_test.py

@@ -8,16 +8,15 @@ Unit tests for the contents of shared_prefs.py (mostly SharedPrefs).

"""

import logging

-import os

import sys

import unittest

+from devil import devil_env

from devil.android import device_utils

from devil.android.sdk import shared_prefs

-from pylib import constants

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

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

+devil_env.InitializeForTests()

+sys.path.append(devil_env.instance.pymock_path)

import mock # pylint: disable=import-error