diff options
author | Joffrey F <f.joffrey@gmail.com> | 2015-08-25 14:57:59 -0700 |
---|---|---|
committer | Joffrey F <f.joffrey@gmail.com> | 2015-08-25 14:57:59 -0700 |
commit | 47e0ad6959dd08776f35e67ba4f26e0fa3d336e1 (patch) | |
tree | 442d78e6053717d19defeed86a37f0991eb2b5bc | |
parent | 1308049d2f30c4a66ff9e123487b245368326796 (diff) | |
parent | 113901c8e3e8fa9b6eee946a6a3dd9da2dcbe89b (diff) | |
download | docker-py-47e0ad6959dd08776f35e67ba4f26e0fa3d336e1.tar.gz |
Merge pull request #735 from aanand/test-network-mode-version
Explicitly test NetworkMode logic in create_host_config
-rw-r--r-- | docker/client.py | 5 | ||||
-rw-r--r-- | tests/utils_test.py | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/docker/client.py b/docker/client.py index 542b8c5..9853444 100644 --- a/docker/client.py +++ b/docker/client.py @@ -271,6 +271,11 @@ class Client(clientbase.ClientBase): def create_host_config(self, *args, **kwargs): if not kwargs: kwargs = {} + if 'version' in kwargs: + raise TypeError( + "create_host_config() got an unexpected " + "keyword argument 'version'" + ) kwargs['version'] = self._version return utils.create_host_config(*args, **kwargs) diff --git a/tests/utils_test.py b/tests/utils_test.py index 91d676f..f10b0d0 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -144,11 +144,13 @@ class UtilsTest(base.BaseTestCase): for filters, expected in tests: self.assertEqual(convert_filters(filters), expected) - def test_create_empty_host_config(self): - empty_config = create_host_config( - network_mode='', version=DEFAULT_DOCKER_API_VERSION - ) - self.assertEqual(empty_config, {}) + def test_create_host_config_no_options(self): + config = create_host_config(version='1.19') + self.assertFalse('NetworkMode' in config) + + def test_create_host_config_no_options_newer_api_version(self): + config = create_host_config(version='1.20') + self.assertEqual(config['NetworkMode'], 'default') def test_create_host_config_dict_ulimit(self): ulimit_dct = {'name': 'nofile', 'soft': 8096} |