Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix out of order docker Env comparison #50272

Merged
merged 6 commits into from Nov 7, 2018
Merged

Fix out of order docker Env comparison #50272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fdd8fb2
Compare sorted docker environment
Oct 29, 2018
8a667d8
Merge branch 'develop' into fix-docker-env-order/develop
jyurdal Oct 30, 2018
6e8b8b9
extra blank line after function definition(pylint)
Oct 31, 2018
df9db81
Merge branch 'develop' into fix-docker-env-order/develop
Nov 1, 2018
8d006c3
Add unit test for comparing containers with the same env vars
terminalmage Nov 6, 2018
eab0726
Remove unnecessary u prefix from string literals
terminalmage Nov 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions salt/modules/dockermod.py
View file
Open in desktop
Expand Up @@ -948,6 +948,9 @@ def compare_containers(first, second, ignore=None):
if item == 'Ulimits':
val1 = _ulimit_sort(val1)
val2 = _ulimit_sort(val2)
if item == 'Env':
val1 = sorted(val1)
val2 = sorted(val2)
if val1 != val2:
ret.setdefault(conf_dict, {})[item] = {'old': val1, 'new': val2}
# Check for optionally-present items that were in the second container
Expand All @@ -974,6 +977,9 @@ def compare_containers(first, second, ignore=None):
if item == 'Ulimits':
val1 = _ulimit_sort(val1)
val2 = _ulimit_sort(val2)
if item == 'Env':
val1 = sorted(val1)
val2 = sorted(val2)
if val1 != val2:
ret.setdefault(conf_dict, {})[item] = {'old': val1, 'new': val2}
return ret
Expand Down Expand Up @@ -5583,6 +5589,7 @@ def pause(name):
.format(name))}
return _change_state(name, 'pause', 'paused')


freeze = salt.utils.functools.alias_function(pause, 'freeze')


Expand Down Expand Up @@ -5785,6 +5792,7 @@ def unpause(name):
.format(name))}
return _change_state(name, 'unpause', 'running')


unfreeze = salt.utils.functools.alias_function(unpause, 'unfreeze')


Expand Down
37 changes: 33 additions & 4 deletions tests/unit/modules/test_dockermod.py
View file
Open in desktop
Expand Up @@ -822,15 +822,44 @@ def _inspect_container_effect(id_):
'container1': {'Config': {},
'HostConfig': {
'Ulimits': [
{u'Hard': -1, u'Soft': -1, u'Name': u'core'},
{u'Hard': 65536, u'Soft': 65536, u'Name': u'nofile'}
{'Hard': -1, 'Soft': -1, 'Name': 'core'},
{'Hard': 65536, 'Soft': 65536, 'Name': 'nofile'}
]
}},
'container2': {'Config': {},
'HostConfig': {
'Ulimits': [
{u'Hard': 65536, u'Soft': 65536, u'Name': u'nofile'},
{u'Hard': -1, u'Soft': -1, u'Name': u'core'}
{'Hard': 65536, 'Soft': 65536, 'Name': 'nofile'},
{'Hard': -1, 'Soft': -1, 'Name': 'core'}
]
}},
}[id_]

inspect_container_mock = MagicMock(side_effect=_inspect_container_effect)

with patch.object(docker_mod, 'inspect_container', inspect_container_mock):
ret = docker_mod.compare_container('container1', 'container2')
self.assertEqual(ret, {})

def test_compare_container_env_order(self):
'''
Test comparing two containers when the order of the Env HostConfig
values are different, but the values are the same.
'''
def _inspect_container_effect(id_):
return {
'container1': {'Config': {},
'HostConfig': {
'Env': [
'FOO=bar',
'HELLO=world',
]
}},
'container2': {'Config': {},
'HostConfig': {
'Env': [
'HELLO=world',
'FOO=bar',
]
}},
}[id_]
Expand Down