[Android] Add a configurable environment for devil/.

build/android/devil/android/battery_utils_test.py

Index: build/android/devil/android/battery_utils_test.py
diff --git a/build/android/devil/android/battery_utils_test.py b/build/android/devil/android/battery_utils_test.py
index 64253a526c598d677c402516e6e8d02173d38a78..4139eeb3b2abee9751bb67abec82d395854d3f0f 100755
--- a/build/android/devil/android/battery_utils_test.py
+++ b/build/android/devil/android/battery_utils_test.py
@@ -10,19 +10,18 @@ Unit tests for the contents of battery_utils.py
 # pylint: disable=protected-access,unused-argument
 
 import logging
-import os
 import sys
 import unittest
 
+from devil import devil_env
 from devil.android import battery_utils
 from devil.android import device_errors
 from devil.android import device_utils
 from devil.android import device_utils_test
 from devil.utils import mock_calls
-from pylib import constants
 
-sys.path.append(os.path.join(
-    constants.DIR_SOURCE_ROOT, 'third_party', 'pymock'))
+devil_env.InitializeForTests()

[perezju, 2015/09/14 09:13:58]

I don't like having to add this bit all over the place in all modules. What if I
want to import this module into another script, but use a different non-tests
config? What is the expected behavior if two modules imported by the same script
use different InitializeFor* methods? It sounds all very confusing.

I have a suggestion to get rid of this in devil_env.

[jbudorick, 2015/09/14 13:12:39]

Note that this is only necessary for tests that import pymock.

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

[perezju, 2015/09/14 09:13:58]

suggestion nit: maybe rename "instance" to "config"?

 import mock # pylint: disable=F0401
 
 _DUMPSYS_OUTPUT = [