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

[stable-2.9] Fix docker_image tests #72953

Merged
merged 2 commits into from Jan 10, 2021
Merged

[stable-2.9] Fix docker_image tests #72953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
614f67b
Backport of https://github.com/ansible-collections/community.docker/p…
felixfontein Dec 11, 2020
3021863
Also fix old-options.
felixfontein Dec 11, 2020
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
4 changes: 2 additions & 2 deletions test/integration/targets/docker_image/tasks/tests/old-options.yml
View file
Open in desktop
Expand Up @@ -25,8 +25,8 @@
TEST2: val2
TEST3: "True"
container_limits:
memory: 5000000
memswap: 7000000
memory: 7000000
memswap: 8000000
source: build
register: build

Expand Down
8 changes: 4 additions & 4 deletions test/integration/targets/docker_image/tasks/tests/options.yml
View file
Open in desktop
Expand Up @@ -78,8 +78,8 @@
build:
path: "{{ role_path }}/files"
container_limits:
memory: 5000000
memswap: 7000000
memory: 7000000
memswap: 8000000
pull: no
source: build
register: container_limits_2
Expand All @@ -95,10 +95,10 @@
# It *sometimes* happens that the first task does not fail.
# For now, we work around this by
# a) requiring that if it fails, the message must
# contain 'Minimum memory limit allowed is 4MB', and
# contain 'Minimum memory limit allowed is (4|6)MB', and
# b) requiring that either the first task, or the second
# task is changed, but not both.
- "not container_limits_1 is failed or ('Minimum memory limit allowed is 4MB') in container_limits_1.msg"
- "not container_limits_1 is failed or ('Minimum memory limit allowed is ') in container_limits_1.msg"
- "container_limits_1 is changed or container_limits_2 is changed and not (container_limits_1 is changed and container_limits_2 is changed)"

####################################################################
Expand Down