From 3fe08cbfe5acc382ad907d29f77d7dcd938d5b77 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Mon, 21 Mar 2016 18:17:27 -0700 Subject: Support passing an alternate environment dict to kwargs_from_env Signed-off-by: Joffrey F --- tests/unit/utils_test.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'tests/unit/utils_test.py') 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): -- cgit v1.2.1