Ulimits are now merged into extended services

Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
This commit is contained in:
Dimitar Bonev 2016-01-07 21:21:47 +02:00
commit 2f07e2ac36
3 changed files with 48 additions and 8 deletions

View file

@ -1396,6 +1396,24 @@ class ExtendsTest(unittest.TestCase):
}
]))
def test_merging_env_labels_ulimits(self):
service_dicts = load_from_filename('tests/fixtures/extends/common-env-labels-ulimits.yml')
self.assertEqual(service_sort(service_dicts), service_sort([
{
'name': 'web',
'image': 'busybox',
'command': '/bin/true',
'environment': {
"FOO": "2",
"BAR": "1",
"BAZ": "3",
},
'labels': {'label': 'one'},
'ulimits': {'nproc': 65535, 'memlock': {'soft': 1024, 'hard': 2048}}
}
]))
def test_nested(self):
service_dicts = load_from_filename('tests/fixtures/extends/nested.yml')