diff options
| author | Felix Fontein <felix@fontein.de> | 2021-01-10 23:20:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-10 16:20:47 -0600 |
| commit | c73de6f0b3e304b75ee2dabcec1b5571ae2f632c (patch) | |
| tree | 5e2120ebfe0c9b9f6471d148060655f85cc5fc98 | |
| parent | 77ae0819f969f0700b9d849ec4a9720a259cee55 (diff) | |
| download | ansible-c73de6f0b3e304b75ee2dabcec1b5571ae2f632c.tar.gz | |
[stable-2.9] Fix docker_image tests (#72953)
* Backport of https://github.com/ansible-collections/community.docker/pull/47 to stable-2.9.
* Also fix old-options.
| -rw-r--r-- | test/integration/targets/docker_image/tasks/tests/old-options.yml | 4 | ||||
| -rw-r--r-- | test/integration/targets/docker_image/tasks/tests/options.yml | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/integration/targets/docker_image/tasks/tests/old-options.yml b/test/integration/targets/docker_image/tasks/tests/old-options.yml index 5824a56d1f..5e4845cf11 100644 --- a/test/integration/targets/docker_image/tasks/tests/old-options.yml +++ b/test/integration/targets/docker_image/tasks/tests/old-options.yml @@ -25,8 +25,8 @@ TEST2: val2 TEST3: "True" container_limits: - memory: 5000000 - memswap: 7000000 + memory: 7000000 + memswap: 8000000 source: build register: build diff --git a/test/integration/targets/docker_image/tasks/tests/options.yml b/test/integration/targets/docker_image/tasks/tests/options.yml index 1c045b9a28..71cb9c94a2 100644 --- a/test/integration/targets/docker_image/tasks/tests/options.yml +++ b/test/integration/targets/docker_image/tasks/tests/options.yml @@ -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 @@ -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)" #################################################################### |