From 9728ad5d26fd283523867049fff61f03458ae183 Mon Sep 17 00:00:00 2001
From: "R. Sicart" <roger.sicart@gmail.com>
Date: Tue, 30 Aug 2022 16:59:45 +0200
Subject: [PATCH] Fix assertions named 'GRANT permission is present'

---
 .../test_mysql_user/tasks/test_privs.yml      | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)

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 c5a5e51..5cc0ff3 100644
--- a/tests/integration/targets/test_mysql_user/tasks/test_privs.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/test_privs.yml
@@ -180,6 +180,13 @@
           - result is not changed
       when: (install_type == 'mysql' and mysql_version is version('8', '<')) or (install_type == 'mariadb' and mariadb_version is version('10.2', '=='))
 
+    - name: remove username
+      mysql_user:
+        <<: *mysql_params
+        name: '{{ user_name_2 }}'
+        password: '{{ user_password_2 }}'
+        state: absent
+
     # ============================================================
     - name: grant all privileges with grant option
       mysql_user:
@@ -193,12 +200,18 @@
     - name: Assert that priv changed
       assert:
         that:
-          - "\"granted ['ALL', 'GRANT']\" in result.msg"
+          - result is changed
+
+    - name: Collect user info by host
+      community.mysql.mysql_info:
+        <<: *mysql_params
+        filter: "users"
+      register: mysql_info_about_users
 
     - name: Assert that 'GRANT' permission is present
       assert:
         that:
-          - "\"granted ['ALL', 'GRANT']\" in result.msg"
+          - "mysql_info_about_users.users.localhost.{{ user_name_2 }}.Grant_priv == 'Y'"
 
     - name: Test idempotency (expect ok)
       mysql_user:
@@ -216,19 +229,16 @@
           - result is not changed
       when: (install_type == 'mysql' and mysql_version is version('8', '<')) or (install_type == 'mariadb' and mariadb_version is version('10.2', '=='))
 
+    - name: Collect user info by host
+      community.mysql.mysql_info:
+        <<: *mysql_params
+        filter: "users"
+      register: mysql_info_about_users
+
     - name: Assert that 'GRANT' permission is present
       assert:
         that:
-          - "\"granted ['ALL', 'GRANT']\" in result.msg"
-
-    - name: drop database using user
-      mysql_db:
-        login_user: '{{ user_name_2 }}'
-        login_password: '{{ user_password_2 }}'
-        login_host: '{{ mysql_host }}'
-        login_port: '{{ mysql_primary_port }}'
-        name: '{{ db_name }}'
-        state: absent
+          - "mysql_info_about_users.users.localhost.{{ user_name_2 }}.Grant_priv == 'Y'"
 
     # ============================================================
     - name: update user with invalid privileges