From 0b5ab1e041dec7e457f9884fdaeb7a395c22e150 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Fri, 31 May 2019 23:47:53 +0200
Subject: [PATCH] Fix assignments in docker tests. (#57249)

(cherry picked from commit 7cd229aa972a249bd8648cdeb327cc0352fc82b2)
---
 .../targets/docker_container/tasks/tests/options.yml          | 4 ++--
 .../targets/docker_container/tasks/tests/start-stop.yml       | 2 +-
 test/integration/targets/docker_image/tasks/tests/options.yml | 2 +-
 test/integration/targets/docker_network/tasks/tests/basic.yml | 4 ++--
 .../targets/docker_network/tasks/tests/options.yml            | 2 +-
 .../targets/docker_network/tasks/tests/substring.yml          | 2 +-
 test/integration/targets/docker_volume/tasks/tests/basic.yml  | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/integration/targets/docker_container/tasks/tests/options.yml b/test/integration/targets/docker_container/tasks/tests/options.yml
index 873236e4bf..5985ff9d98 100644
--- a/test/integration/targets/docker_container/tasks/tests/options.yml
+++ b/test/integration/targets/docker_container/tasks/tests/options.yml
@@ -9,8 +9,8 @@
     nname_2: "{{ cname_prefix ~ '-network-2' }}"
 - name: Registering container name
   set_fact:
-    cnames: "{{ cnames }} + [cname, cname_h1, cname_h2, cname_h3]"
-    dnetworks: "{{ dnetworks }} + [nname_1, nname_2]"
+    cnames: "{{ cnames + [cname, cname_h1, cname_h2, cname_h3] }}"
+    dnetworks: "{{ dnetworks + [nname_1, nname_2] }}"
 
 - name: Create networks
   docker_network:
diff --git a/test/integration/targets/docker_container/tasks/tests/start-stop.yml b/test/integration/targets/docker_container/tasks/tests/start-stop.yml
index e52dd4cff2..85ac454a30 100644
--- a/test/integration/targets/docker_container/tasks/tests/start-stop.yml
+++ b/test/integration/targets/docker_container/tasks/tests/start-stop.yml
@@ -4,7 +4,7 @@
     cname: "{{ cname_prefix ~ '-hi' }}"
 - name: Registering container name
   set_fact:
-    cnames: "{{ cnames }} + [cname]"
+    cnames: "{{ cnames + [cname] }}"
 
 ####################################################################
 ## Creation ########################################################
diff --git a/test/integration/targets/docker_image/tasks/tests/options.yml b/test/integration/targets/docker_image/tasks/tests/options.yml
index f7df96a1c8..5ca5fdb317 100644
--- a/test/integration/targets/docker_image/tasks/tests/options.yml
+++ b/test/integration/targets/docker_image/tasks/tests/options.yml
@@ -6,7 +6,7 @@
 
 - name: Registering image name
   set_fact:
-    inames: "{{ inames }} + [iname, iname_1]"
+    inames: "{{ inames + [iname, iname_1] }}"
 
 ####################################################################
 ## buildargs #######################################################
diff --git a/test/integration/targets/docker_network/tasks/tests/basic.yml b/test/integration/targets/docker_network/tasks/tests/basic.yml
index 5d9bf84ff3..e65b658fba 100644
--- a/test/integration/targets/docker_network/tasks/tests/basic.yml
+++ b/test/integration/targets/docker_network/tasks/tests/basic.yml
@@ -8,8 +8,8 @@
     nname_2: "{{ name_prefix ~ '-network-2' }}"
 - name: Registering container and network names
   set_fact:
-    cnames: "{{ cnames }} + [cname_1, cname_2, cname_3]"
-    dnetworks: "{{ dnetworks }} + [nname_1, nname_2]"
+    cnames: "{{ cnames + [cname_1, cname_2, cname_3] }}"
+    dnetworks: "{{ dnetworks + [nname_1, nname_2] }}"
 
 - name: Create containers
   docker_container:
diff --git a/test/integration/targets/docker_network/tasks/tests/options.yml b/test/integration/targets/docker_network/tasks/tests/options.yml
index 0d5ecf7e96..e567887c18 100644
--- a/test/integration/targets/docker_network/tasks/tests/options.yml
+++ b/test/integration/targets/docker_network/tasks/tests/options.yml
@@ -4,7 +4,7 @@
     nname_1: "{{ name_prefix ~ '-network-1' }}"
 - name: Registering network name
   set_fact:
-    dnetworks: "{{ dnetworks }} + [nname_1]"
+    dnetworks: "{{ dnetworks + [nname_1] }}"
 
 ####################################################################
 ## driver_options ##################################################
diff --git a/test/integration/targets/docker_network/tasks/tests/substring.yml b/test/integration/targets/docker_network/tasks/tests/substring.yml
index d789348b2d..bdee190e96 100644
--- a/test/integration/targets/docker_network/tasks/tests/substring.yml
+++ b/test/integration/targets/docker_network/tasks/tests/substring.yml
@@ -5,7 +5,7 @@
     nname_2: "{{ name_prefix ~ '-network-foobar' }}"
 - name: Registering container and network names
   set_fact:
-    dnetworks: "{{ dnetworks }} + [nname_1, nname_2]"
+    dnetworks: "{{ dnetworks + [nname_1, nname_2] }}"
 
 ####################################################################
 
diff --git a/test/integration/targets/docker_volume/tasks/tests/basic.yml b/test/integration/targets/docker_volume/tasks/tests/basic.yml
index 35dbb37341..3e53e0b952 100644
--- a/test/integration/targets/docker_volume/tasks/tests/basic.yml
+++ b/test/integration/targets/docker_volume/tasks/tests/basic.yml
@@ -4,7 +4,7 @@
     vname: "{{ name_prefix ~ '-basic' }}"
 - name: Registering container name
   set_fact:
-    vnames: "{{ vnames }} + [vname]"
+    vnames: "{{ vnames + [vname] }}"
 
 ####################################################################
 ## basic ###########################################################