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

Add stop_grace_period to ALLOWED_KEYS 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2017-12-11 11:03:19 -08:00
parent 0c5e82955e
commit fffcc05a8e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compose/config/config.py
View File

@ -126,6 +126,7 @@ ALLOWED_KEYS = DOCKER_CONFIG_KEYS + [
'network_mode', 'network_mode',
'init', 'init',
'scale', 'scale',
'stop_grace_period',
] ]
DOCKER_VALID_URL_PREFIXES = ( DOCKER_VALID_URL_PREFIXES = (

4
tests/unit/config/config_test.py
View File

@ -1150,7 +1150,8 @@ class ConfigTest(unittest.TestCase):
'volumes': [ 'volumes': [
{'source': '/a', 'target': '/b', 'type': 'bind'}, {'source': '/a', 'target': '/b', 'type': 'bind'},
{'source': 'vol', 'target': '/x', 'type': 'volume', 'read_only': True} {'source': 'vol', 'target': '/x', 'type': 'volume', 'read_only': True}
] ],
'stop_grace_period': '30s',
} }
}, },
'volumes': {'vol': {}} 'volumes': {'vol': {}}
@ -1177,6 +1178,7 @@ class ConfigTest(unittest.TestCase):
'/c:/b:rw', '/c:/b:rw',
{'source': 'vol', 'target': '/x', 'type': 'volume', 'read_only': True} {'source': 'vol', 'target': '/x', 'type': 'volume', 'read_only': True}
] ]
assert service_dicts[0]['stop_grace_period'] == '30s'
@mock.patch.dict(os.environ) @mock.patch.dict(os.environ)
def test_volume_mode_override(self): def test_volume_mode_override(self):