Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add v3_only marker to healthcheck test #4256

Merged
merged 1 commit into from
Dec 16, 2016
Merged

Add v3_only marker to healthcheck test #4256

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions tests/acceptance/cli_test.py
View file
Open in desktop
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