From bc0e0c30492c25a09efc01173d06d5499254f457 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sun, 15 Nov 2020 17:21:50 +0100 Subject: [PATCH] Adjust version_added, re-place tests. (#34) --- plugins/modules/docker_image.py | 2 +- .../targets/docker_image/tasks/tests/docker_image.yml | 5 ----- .../integration/targets/docker_image/tasks/tests/options.yml | 1 + 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/plugins/modules/docker_image.py b/plugins/modules/docker_image.py index 922547d2..3daf0090 100644 --- a/plugins/modules/docker_image.py +++ b/plugins/modules/docker_image.py @@ -296,7 +296,7 @@ stdout: returned: success type: str sample: "" - version_added: 1.3.0 + version_added: 1.0.0 ''' import errno diff --git a/tests/integration/targets/docker_image/tasks/tests/docker_image.yml b/tests/integration/targets/docker_image/tasks/tests/docker_image.yml index 3cb45d01..1959446a 100644 --- a/tests/integration/targets/docker_image/tasks/tests/docker_image.yml +++ b/tests/integration/targets/docker_image/tasks/tests/docker_image.yml @@ -136,11 +136,6 @@ - repository_1 is changed - repository_2 is not changed -# Uncomment in community.docker -# - assert: -# that: -# - 'FROM busybox' in repository_1.stdout - - name: Get facts of image docker_image_info: name: "{{ test_image_base }}:latest" diff --git a/tests/integration/targets/docker_image/tasks/tests/options.yml b/tests/integration/targets/docker_image/tasks/tests/options.yml index f21bbda9..45d1f166 100644 --- a/tests/integration/targets/docker_image/tasks/tests/options.yml +++ b/tests/integration/targets/docker_image/tasks/tests/options.yml @@ -130,6 +130,7 @@ - assert: that: - dockerfile_1 is changed + - "'FROM alpine:3.7' in dockerfile_1.stdout" - dockerfile_1['image']['Config']['WorkingDir'] == '/newdata' ####################################################################