From af977daec7867a047ae4c4beaf5562f707f8fa08 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Wed, 30 Jan 2019 20:25:32 +0100
Subject: [PATCH] Adjusting to differences between Ansible 2.7 and Ansible 2.8.

(cherry picked from commit 6cdb357826ffb1446e4ceb1050349fe30f511b41)
---
 .../targets/docker_image/tasks/tests/options.yml           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/integration/targets/docker_image/tasks/tests/options.yml b/test/integration/targets/docker_image/tasks/tests/options.yml
index d5e992c9495..c1a9edce68d 100644
--- a/test/integration/targets/docker_image/tasks/tests/options.yml
+++ b/test/integration/targets/docker_image/tasks/tests/options.yml
@@ -162,7 +162,7 @@
     force: yes
   register: force_1
 
-- name: force (unchanged)
+- name: force (unchanged, but still changed)
   docker_image:
     path: "{{ role_path }}/files"
     name: "{{ iname }}"
@@ -178,7 +178,10 @@
 - assert:
     that:
     - force_1 is changed
-    - force_2 is not changed
+    # In Ansible 2.7, there's no detection which will detect that the
+    # resulting image didn't change. That's why force_2 is changed
+    # for Ansible 2.7, but not for Ansible 2.8.
+    - force_2 is changed
 
 ####################################################################
 ## load path #######################################################