ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

[stable-1] Fix docker_image tests (#1476)

Browse source 
* Backport of https://github.com/ansible-collections/community.docker/pull/47 to stable-1.

* Also fix old-options.
This commit is contained in:
Felix Fontein 2020-12-12 08:33:09 +01:00 • committed by GitHub
parent b76492687b
commit 154d8a313c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/integration/targets/docker_image/tasks/tests/old-options.yml
View file

@ -25,8 +25,8 @@
TEST2: val2 TEST2: val2
TEST3: "True" TEST3: "True"
container_limits: container_limits:
memory: 5000000 memory: 7000000
memswap: 7000000 memswap: 8000000
source: build source: build
register: build register: build

8
tests/integration/targets/docker_image/tasks/tests/options.yml
View file

@ -84,8 +84,8 @@
build: build:
path: "{{ output_dir }}/files" path: "{{ output_dir }}/files"
container_limits: container_limits:
memory: 5000000 memory: 7000000
memswap: 7000000 memswap: 8000000
pull: no pull: no
source: build source: build
register: container_limits_2 register: container_limits_2
@ -101,10 +101,10 @@
# It *sometimes* happens that the first task does not fail. # It *sometimes* happens that the first task does not fail.
# For now, we work around this by # For now, we work around this by
# a) requiring that if it fails, the message must # 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 # b) requiring that either the first task, or the second
# task is changed, but not both. # 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)" - "container_limits_1 is changed or container_limits_2 is changed and not (container_limits_1 is changed and container_limits_2 is changed)"
#################################################################### ####################################################################