docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #735 from aanand/test-network-mode-version 

Explicitly test NetworkMode logic in create_host_config
This commit is contained in:
Joffrey F 2015-08-25 14:57:59 -07:00
parent 1308049d2f 113901c8e3
commit 47e0ad6959
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/client.py
View File

@ -271,6 +271,11 @@ class Client(clientbase.ClientBase):
def create_host_config(self, *args, **kwargs): def create_host_config(self, *args, **kwargs):
if not kwargs: if not kwargs:
kwargs = {} kwargs = {}
if 'version' in kwargs:
raise TypeError(
"create_host_config() got an unexpected "
"keyword argument 'version'"
)
kwargs['version'] = self._version kwargs['version'] = self._version
return utils.create_host_config(*args, **kwargs) return utils.create_host_config(*args, **kwargs)

12
tests/utils_test.py
View File

@ -144,11 +144,13 @@ class UtilsTest(base.BaseTestCase):
for filters, expected in tests: for filters, expected in tests:
self.assertEqual(convert_filters(filters), expected) self.assertEqual(convert_filters(filters), expected)
def test_create_empty_host_config(self): def test_create_host_config_no_options(self):
empty_config = create_host_config( config = create_host_config(version='1.19')
network_mode='', version=DEFAULT_DOCKER_API_VERSION self.assertFalse('NetworkMode' in config)
)
self.assertEqual(empty_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): def test_create_host_config_dict_ulimit(self):
ulimit_dct = {'name': 'nofile', 'soft': 8096} ulimit_dct = {'name': 'nofile', 'soft': 8096}