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

Add v3_only marker to healthcheck test

Browse Source 
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2016-12-16 12:21:59 -08:00
parent 9cb6a70b6f
commit fb165d9c15
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/acceptance/cli_test.py
View File

@ -316,8 +316,8 @@ class CLITestCase(DockerClientTestCase):
'memory': '50M', 'memory': '50M',
}, },
'reservations': { 'reservations': {
'cpus': '0.0001', 'cpus': '0.0001',
'memory': '20M', 'memory': '20M',
}, },
}, },
'restart_policy': { 'restart_policy': {
@ -928,6 +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)
@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():
@ -945,7 +946,7 @@ class CLITestCase(DockerClientTestCase):
assert passes_container.get('Config.Healthcheck') == { assert passes_container.get('Config.Healthcheck') == {
"Test": ["CMD-SHELL", "/bin/true"], "Test": ["CMD-SHELL", "/bin/true"],
"Interval": nanoseconds_from_time_seconds(1), "Interval": nanoseconds_from_time_seconds(1),
"Timeout": nanoseconds_from_time_seconds(30*60), "Timeout": nanoseconds_from_time_seconds(30 * 60),
"Retries": 1, "Retries": 1,
} }