summaryrefslogtreecommitdiff
path: root/tests/unit/utils_test.py
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2016-03-21 18:17:27 -0700
committerJoffrey F <joffrey@docker.com>2016-03-21 18:17:27 -0700
commit3fe08cbfe5acc382ad907d29f77d7dcd938d5b77 (patch)
treec496c292a045d621a7aab8d40da153d587662c4a /tests/unit/utils_test.py
parent5c1c42397cf0fdb74182df2d69822b82df8f2a6a (diff)
downloaddocker-py-kwargs_from_env_alt.tar.gz
Support passing an alternate environment dict to kwargs_from_envkwargs_from_env_alt
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'tests/unit/utils_test.py')
-rw-r--r--tests/unit/utils_test.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/unit/utils_test.py b/tests/unit/utils_test.py
index c744604..bd79459 100644
--- a/tests/unit/utils_test.py
+++ b/tests/unit/utils_test.py
@@ -249,6 +249,20 @@ class KwargsFromEnvTest(base.BaseTestCase):
if temp_dir:
shutil.rmtree(temp_dir)
+ def test_kwargs_from_env_alternate_env(self):
+ # Values in os.environ are entirely ignored if an alternate is
+ # provided
+ os.environ.update(
+ DOCKER_HOST='tcp://192.168.59.103:2376',
+ DOCKER_CERT_PATH=TEST_CERT_DIR,
+ DOCKER_TLS_VERIFY=''
+ )
+ kwargs = kwargs_from_env(environment={
+ 'DOCKER_HOST': 'http://docker.gensokyo.jp:2581',
+ })
+ assert 'http://docker.gensokyo.jp:2581' == kwargs['base_url']
+ assert 'tls' not in kwargs
+
class ConverVolumeBindsTest(base.BaseTestCase):
def test_convert_volume_binds_empty(self):