tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-26 15:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix condition name in config tests

Browse Source 
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2016-12-19 20:39:16 -08:00
parent 04394b1d0a
commit bef2308530
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/acceptance/cli_test.py
View File

@ -928,7 +928,7 @@ class CLITestCase(DockerClientTestCase):
assert foo_container.get('HostConfig.NetworkMode') == \ assert foo_container.get('HostConfig.NetworkMode') == \
'container:{}'.format(bar_container.id) 'container:{}'.format(bar_container.id)
@v2_1_only() @v3_only()
def test_up_with_healthcheck(self): def test_up_with_healthcheck(self):
def wait_on_health_status(container, status): def wait_on_health_status(container, status):
def condition(): def condition():

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

@ -921,8 +921,8 @@ class ConfigTest(unittest.TestCase):
'image': 'example/web', 'image': 'example/web',
'volumes': [VolumeSpec.parse('/home/user/project:/code')], 'volumes': [VolumeSpec.parse('/home/user/project:/code')],
'depends_on': { 'depends_on': {
'db': {'condition': 'container_start'}, 'db': {'condition': 'service_started'},
'other': {'condition': 'container_start'}, 'other': {'condition': 'service_started'},
}, },
}, },
{ {
@ -3059,7 +3059,7 @@ class ExtendsTest(unittest.TestCase):
""") """)
services = load_from_filename(str(tmpdir.join('docker-compose.yml'))) services = load_from_filename(str(tmpdir.join('docker-compose.yml')))
assert service_sort(services)[2]['depends_on'] == { assert service_sort(services)[2]['depends_on'] == {
'other': {'condition': 'container_start'} 'other': {'condition': 'service_started'}
} }