Skip to content

Commit

Permalink
Add v3_only marker to healthcheck test
Browse files Browse the repository at this point in the history
Signed-off-by: Joffrey F <joffrey@docker.com>
  • Loading branch information
shin- committed Dec 16, 2016
1 parent 9cb6a70 commit fb165d9
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions tests/acceptance/cli_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,8 @@ def test_config_v3(self):
'memory': '50M',
},
'reservations': {
'cpus': '0.0001',
'memory': '20M',
'cpus': '0.0001',
'memory': '20M',
},
},
'restart_policy': {
Expand Down Expand Up @@ -928,6 +928,7 @@ def test_up_with_net_v1(self):
assert foo_container.get('HostConfig.NetworkMode') == \
'container:{}'.format(bar_container.id)

@v3_only()
def test_up_with_healthcheck(self):
def wait_on_health_status(container, status):
def condition():
Expand All @@ -945,7 +946,7 @@ def condition():
assert passes_container.get('Config.Healthcheck') == {
"Test": ["CMD-SHELL", "/bin/true"],
"Interval": nanoseconds_from_time_seconds(1),
"Timeout": nanoseconds_from_time_seconds(30*60),
"Timeout": nanoseconds_from_time_seconds(30 * 60),
"Retries": 1,
}

Expand Down

0 comments on commit fb165d9

Please sign in to comment.