Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-08-28 12:23:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #4563 from shin-/3723-mem-reservation

Browse source 
Add mem_reservation option to service config in 2.0 and 2.1 formats
This commit is contained in:
Joffrey F 2017-03-07 15:23:22 -08:00 • committed by GitHub
commit dd4e49ef98
6 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/integration/service_test.py
View file

@ -880,6 +880,11 @@ class ServiceTest(DockerClientTestCase):
container = create_and_start_container(service)
self.assertEqual(container.get('HostConfig.MemorySwappiness'), 11)
def test_mem_reservation(self):
service = self.create_service('web', mem_reservation='20m')
container = create_and_start_container(service)
assert container.get('HostConfig.MemoryReservation') == 20 * 1024 * 1024
def test_restart_always_value(self):
service = self.create_service('web', restart={'Name': 'always'})
container = create_and_start_container(service)

14
tests/unit/service_test.py
View file

@ -170,6 +170,20 @@ class ServiceTest(unittest.TestCase):
2000000000
)
def test_mem_reservation(self):
self.mock_client.create_host_config.return_value = {}
service = Service(
name='foo',
image='foo',
hostname='name',
client=self.mock_client,
mem_reservation='512m'
)
service._get_container_create_options({'some': 'overrides'}, 1)
assert self.mock_client.create_host_config.called is True
assert self.mock_client.create_host_config.call_args[1]['mem_reservation'] == '512m'
def test_cgroup_parent(self):
self.mock_client.create_host_config.return_value = {}