From 154d8a313c33a598180f82cee995de908de18df0 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sat, 12 Dec 2020 08:33:09 +0100 Subject: [PATCH] [stable-1] Fix docker_image tests (#1476) * Backport of https://github.com/ansible-collections/community.docker/pull/47 to stable-1. * Also fix old-options. --- .../targets/docker_image/tasks/tests/old-options.yml | 4 ++-- .../targets/docker_image/tasks/tests/options.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/integration/targets/docker_image/tasks/tests/old-options.yml b/tests/integration/targets/docker_image/tasks/tests/old-options.yml index 05587e11b2..2bf1ca4ce6 100644 --- a/tests/integration/targets/docker_image/tasks/tests/old-options.yml +++ b/tests/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/tests/integration/targets/docker_image/tasks/tests/options.yml b/tests/integration/targets/docker_image/tasks/tests/options.yml index 9ae9303173..e308bb1a03 100644 --- a/tests/integration/targets/docker_image/tasks/tests/options.yml +++ b/tests/integration/targets/docker_image/tasks/tests/options.yml @@ -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)" ####################################################################