Kaydet (Commit) 595965eb authored tarafından Joffrey F's avatar Joffrey F

Adapt tests to new create_host_config usage

üst 4bd3c48e
This diff is collapsed.
...@@ -4,6 +4,7 @@ import unittest ...@@ -4,6 +4,7 @@ import unittest
import tempfile import tempfile
from docker.client import Client from docker.client import Client
from docker.constants import DEFAULT_DOCKER_API_VERSION
from docker.errors import DockerException from docker.errors import DockerException
from docker.utils import ( from docker.utils import (
parse_repository_tag, parse_host, convert_filters, kwargs_from_env, parse_repository_tag, parse_host, convert_filters, kwargs_from_env,
...@@ -144,12 +145,16 @@ class UtilsTest(base.BaseTestCase): ...@@ -144,12 +145,16 @@ class UtilsTest(base.BaseTestCase):
self.assertEqual(convert_filters(filters), expected) self.assertEqual(convert_filters(filters), expected)
def test_create_empty_host_config(self): def test_create_empty_host_config(self):
empty_config = create_host_config(network_mode='') empty_config = create_host_config(
network_mode='', version=DEFAULT_DOCKER_API_VERSION
)
self.assertEqual(empty_config, {}) self.assertEqual(empty_config, {})
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}
config = create_host_config(ulimits=[ulimit_dct]) config = create_host_config(
ulimits=[ulimit_dct], version=DEFAULT_DOCKER_API_VERSION
)
self.assertIn('Ulimits', config) self.assertIn('Ulimits', config)
self.assertEqual(len(config['Ulimits']), 1) self.assertEqual(len(config['Ulimits']), 1)
ulimit_obj = config['Ulimits'][0] ulimit_obj = config['Ulimits'][0]
...@@ -160,7 +165,9 @@ class UtilsTest(base.BaseTestCase): ...@@ -160,7 +165,9 @@ class UtilsTest(base.BaseTestCase):
def test_create_host_config_dict_ulimit_capitals(self): def test_create_host_config_dict_ulimit_capitals(self):
ulimit_dct = {'Name': 'nofile', 'Soft': 8096, 'Hard': 8096 * 4} ulimit_dct = {'Name': 'nofile', 'Soft': 8096, 'Hard': 8096 * 4}
config = create_host_config(ulimits=[ulimit_dct]) config = create_host_config(
ulimits=[ulimit_dct], version=DEFAULT_DOCKER_API_VERSION
)
self.assertIn('Ulimits', config) self.assertIn('Ulimits', config)
self.assertEqual(len(config['Ulimits']), 1) self.assertEqual(len(config['Ulimits']), 1)
ulimit_obj = config['Ulimits'][0] ulimit_obj = config['Ulimits'][0]
...@@ -172,7 +179,9 @@ class UtilsTest(base.BaseTestCase): ...@@ -172,7 +179,9 @@ class UtilsTest(base.BaseTestCase):
def test_create_host_config_obj_ulimit(self): def test_create_host_config_obj_ulimit(self):
ulimit_dct = Ulimit(name='nofile', soft=8096) ulimit_dct = Ulimit(name='nofile', soft=8096)
config = create_host_config(ulimits=[ulimit_dct]) config = create_host_config(
ulimits=[ulimit_dct], version=DEFAULT_DOCKER_API_VERSION
)
self.assertIn('Ulimits', config) self.assertIn('Ulimits', config)
self.assertEqual(len(config['Ulimits']), 1) self.assertEqual(len(config['Ulimits']), 1)
ulimit_obj = config['Ulimits'][0] ulimit_obj = config['Ulimits'][0]
...@@ -186,14 +195,18 @@ class UtilsTest(base.BaseTestCase): ...@@ -186,14 +195,18 @@ class UtilsTest(base.BaseTestCase):
def test_create_host_config_dict_logconfig(self): def test_create_host_config_dict_logconfig(self):
dct = {'type': LogConfig.types.SYSLOG, 'config': {'key1': 'val1'}} dct = {'type': LogConfig.types.SYSLOG, 'config': {'key1': 'val1'}}
config = create_host_config(log_config=dct) config = create_host_config(
log_config=dct, version=DEFAULT_DOCKER_API_VERSION
)
self.assertIn('LogConfig', config) self.assertIn('LogConfig', config)
self.assertTrue(isinstance(config['LogConfig'], LogConfig)) self.assertTrue(isinstance(config['LogConfig'], LogConfig))
self.assertEqual(dct['type'], config['LogConfig'].type) self.assertEqual(dct['type'], config['LogConfig'].type)
def test_create_host_config_obj_logconfig(self): def test_create_host_config_obj_logconfig(self):
obj = LogConfig(type=LogConfig.types.SYSLOG, config={'key1': 'val1'}) obj = LogConfig(type=LogConfig.types.SYSLOG, config={'key1': 'val1'})
config = create_host_config(log_config=obj) config = create_host_config(
log_config=obj, version=DEFAULT_DOCKER_API_VERSION
)
self.assertIn('LogConfig', config) self.assertIn('LogConfig', config)
self.assertTrue(isinstance(config['LogConfig'], LogConfig)) self.assertTrue(isinstance(config['LogConfig'], LogConfig))
self.assertEqual(obj, config['LogConfig']) self.assertEqual(obj, config['LogConfig'])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment