internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-12 11:51:10 +00:00
Code Issues Packages Projects Releases Wiki 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
2 changed files with 6 additions and 6 deletions
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
TEST3: "True"
container_limits:
memory: 5000000
memswap: 7000000
memory: 7000000
memswap: 8000000
source: build
register: build

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

@@ -84,8 +84,8 @@
build:
path: "{{ output_dir }}/files"
container_limits:
memory: 5000000
memswap: 7000000
memory: 7000000
memswap: 8000000
pull: no
source: build
register: container_limits_2
@@ -101,10 +101,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)"
####################################################################