diff options
author | Joffrey F <joffrey@docker.com> | 2015-09-17 20:07:01 -0700 |
---|---|---|
committer | Joffrey F <joffrey@docker.com> | 2015-10-08 12:14:45 -0700 |
commit | 4b817e9dcc7cbeaca174966edd6f276a39edb257 (patch) | |
tree | 38b339ddb2ccd4211c5dbdc1292670e5fbb87d2e | |
parent | 857f866e37ea7a1993764898b1274d96728ac033 (diff) | |
download | docker-py-4b817e9dcc7cbeaca174966edd6f276a39edb257.tar.gz |
decode_json_header unit test
Signed-off-by: Joffrey F <joffrey@docker.com>
-rw-r--r-- | docker/utils/utils.py | 5 | ||||
-rw-r--r-- | tests/utils_test.py | 14 |
2 files changed, 13 insertions, 6 deletions
diff --git a/docker/utils/utils.py b/docker/utils/utils.py index 43eaa6d..89837b7 100644 --- a/docker/utils/utils.py +++ b/docker/utils/utils.py @@ -180,11 +180,6 @@ def version_gte(v1, v2): return not version_lt(v1, v2) -def decode_json_header(header): - data = base64.b64decode(header).decode('utf-8') - return json.loads(data) - - def ping_registry(url): warnings.warn( 'The `ping_registry` method is deprecated and will be removed.', diff --git a/tests/utils_test.py b/tests/utils_test.py index 8ac1dcb..b1adde2 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- +import base64 +import json import os import os.path import shutil @@ -14,7 +16,7 @@ from docker.errors import DockerException from docker.utils import ( parse_repository_tag, parse_host, convert_filters, kwargs_from_env, create_host_config, Ulimit, LogConfig, parse_bytes, parse_env_file, - exclude_paths, convert_volume_binds, + exclude_paths, convert_volume_binds, decode_json_header ) from docker.utils.ports import build_port_bindings, split_port from docker.auth import resolve_repository_name, resolve_authconfig @@ -370,6 +372,16 @@ class UtilsTest(base.BaseTestCase): for filters, expected in tests: self.assertEqual(convert_filters(filters), expected) + def test_decode_json_header(self): + obj = {'a': 'b', 'c': 1} + data = None + if six.PY3: + data = base64.b64encode(bytes(json.dumps(obj), 'utf-8')) + else: + data = base64.b64encode(json.dumps(obj)) + decoded_data = decode_json_header(data) + self.assertEqual(obj, decoded_data) + def test_resolve_repository_name(self): # docker hub library image self.assertEqual( |