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

Merge eaa6ffaa46 into 526a9db743

This commit is contained in:
Milas Bowman 2025-06-01 18:49:18 -03:00 committed by GitHub
parent 526a9db743 eaa6ffaa46
commit 56d2ef28d7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/types/containers.py
View File

@ -23,9 +23,12 @@ class LogConfigTypesEnum:
'journald', 'journald',
'gelf', 'gelf',
'fluentd', 'fluentd',
'awslogs',
'splunk',
'etwlogs',
'none' 'none'
) )
JSON, SYSLOG, JOURNALD, GELF, FLUENTD, NONE = _values JSON, SYSLOG, JOURNALD, GELF, FLUENTD, AWS, SPLUNK, ETW, NONE = _values
class LogConfig(DictType): class LogConfig(DictType):

14
tests/unit/dockertypes_test.py
View File

@ -269,9 +269,13 @@ class UlimitTest(unittest.TestCase):
Ulimit(name='hello', hard='456') Ulimit(name='hello', hard='456')
class LogConfigTest(unittest.TestCase): @pytest.mark.parametrize(
def test_create_host_config_dict_logconfig(self): "log_config_type",
dct = {'type': LogConfig.types.SYSLOG, 'config': {'key1': 'val1'}} [LogConfig.types.SYSLOG, LogConfig.types.AWS]
)
class LogConfigTest:
def test_create_host_config_dict_logconfig(self, log_config_type):
dct = {'type': log_config_type, 'config': {'key1': 'val1'}}
config = create_host_config( config = create_host_config(
version=DEFAULT_DOCKER_API_VERSION, log_config=dct version=DEFAULT_DOCKER_API_VERSION, log_config=dct
) )
@ -279,8 +283,8 @@ class LogConfigTest(unittest.TestCase):
assert isinstance(config['LogConfig'], LogConfig) assert isinstance(config['LogConfig'], LogConfig)
assert dct['type'] == config['LogConfig'].type assert dct['type'] == config['LogConfig'].type
def test_create_host_config_obj_logconfig(self): def test_create_host_config_obj_logconfig(self, log_config_type):
obj = LogConfig(type=LogConfig.types.SYSLOG, config={'key1': 'val1'}) obj = LogConfig(type=log_config_type, config={'key1': 'val1'})
config = create_host_config( config = create_host_config(
version=DEFAULT_DOCKER_API_VERSION, log_config=obj version=DEFAULT_DOCKER_API_VERSION, log_config=obj
) )