From cf57ab9dda2340dd24f97fd7fbfabf8b2f35892f Mon Sep 17 00:00:00 2001
From: Laurent Indermuehle <laurent.indermuehle@pm.me>
Date: Thu, 24 Apr 2025 19:10:54 +0200
Subject: [PATCH] fix string templating for ansible devel (core 2.19, 12 beta)

---
 .../tasks/mysql_replication_initial.yml                       | 3 ++-
 .../tasks/mysql_replication_primary_delay.yml                 | 2 +-
 .../integration/targets/test_mysql_user/tasks/test_privs.yml  | 4 ++--
 .../targets/test_mysql_variables/tasks/assert_var.yml         | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_initial.yml b/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_initial.yml
index 00699c1..182ea5c 100644
--- a/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_initial.yml
+++ b/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_initial.yml
@@ -337,5 +337,6 @@
     - name: Assert that stopslave returns expected error message
       assert:
         that:
-          - result.msg == "value of mode must be one of{{ ":" }} getprimary, getreplica, changeprimary, stopreplica, startreplica, resetprimary, resetreplica, resetreplicaall, changereplication, got{{ ":" }} stopslave"
+          -
+            "result.msg == 'value of mode must be one of: getprimary, getreplica, changeprimary, stopreplica, startreplica, resetprimary, resetreplica, resetreplicaall, changereplication, got: stopslave'"
           - result is failed
diff --git a/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_primary_delay.yml b/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_primary_delay.yml
index 2093b70..fe22db8 100644
--- a/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_primary_delay.yml
+++ b/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_primary_delay.yml
@@ -55,5 +55,5 @@
 
     - assert:
         that:
-        - replica_status.SQL_Delay == {{ test_primary_delay }}
+        - replica_status.SQL_Delay == test_primary_delay
         - replica_status is not changed
diff --git a/tests/integration/targets/test_mysql_user/tasks/test_privs.yml b/tests/integration/targets/test_mysql_user/tasks/test_privs.yml
index 95d44aa..cd50427 100644
--- a/tests/integration/targets/test_mysql_user/tasks/test_privs.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/test_privs.yml
@@ -220,7 +220,7 @@
     - name: Privs | Assert that 'GRANT' permission is present
       assert:
         that:
-          - mysql_info_about_users.users.localhost.{{ user_name_2 }}.Grant_priv == 'Y'
+          - mysql_info_about_users.users.localhost.db_user2.Grant_priv == 'Y'
 
     - name: Privs | Test idempotency (expect ok)
       mysql_user:
@@ -246,7 +246,7 @@
     - name: Privs | Assert that 'GRANT' permission is present (by host)
       assert:
         that:
-          - mysql_info_about_users.users.localhost.{{ user_name_2 }}.Grant_priv == 'Y'
+          - mysql_info_about_users.users.localhost.db_user2.Grant_priv == 'Y'
 
     # ============================================================
     - name: Privs | Update user with invalid privileges
diff --git a/tests/integration/targets/test_mysql_variables/tasks/assert_var.yml b/tests/integration/targets/test_mysql_variables/tasks/assert_var.yml
index e64c5a7..65bf96b 100644
--- a/tests/integration/targets/test_mysql_variables/tasks/assert_var.yml
+++ b/tests/integration/targets/test_mysql_variables/tasks/assert_var.yml
@@ -33,5 +33,5 @@
   assert:
     that:
       - result is changed
-      - "'{{ var_name }}' in result.stdout"
-      - "'{{ var_value }}' in result.stdout"
+      - var_name | string in result.stdout
+      - var_value | string in result.stdout