From 1782d55143db5f2d1fdc64481ed7628eed295cd1 Mon Sep 17 00:00:00 2001
From: "R. Sicart" <roger.sicart@gmail.com>
Date: Mon, 21 Feb 2022 19:42:08 +0100
Subject: [PATCH] Add tests to verify role grants for roles

---
 .../tasks/mysql_role_initial.yml              | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/tests/integration/targets/test_mysql_role/tasks/mysql_role_initial.yml b/tests/integration/targets/test_mysql_role/tasks/mysql_role_initial.yml
index f6b8bf9..eac0193 100644
--- a/tests/integration/targets/test_mysql_role/tasks/mysql_role_initial.yml
+++ b/tests/integration/targets/test_mysql_role/tasks/mysql_role_initial.yml
@@ -660,7 +660,6 @@
       - result.query_result.0.0['user_roles'] == 0
     when: install_type == 'mariadb'
 
-  # FIXME: do this check with mariadb too
   - name: Check in DB, if not granted, the query will fail
     <<: *task_params
     mysql_query:
@@ -675,6 +674,19 @@
       - result is failed
     when: install_type == 'mysql'
 
+  - name: Check in DB (mariadb)
+    <<: *task_params
+    mysql_query:
+      <<: *mysql_params
+      query: "SELECT count(User) as user_roles FROM mysql.roles_mapping WHERE User = '{{ role1 }}' AND Role = '{{ role0 }}'"
+    when: install_type == 'mariadb'
+
+  - name: Check (mariadb)
+    assert:
+      that:
+      - result.query_result.0.0['user_roles'] == 0
+    when: install_type == 'mariadb'
+
   #========================
 
   - name: Rewrite members
@@ -774,7 +786,6 @@
       - result.query_result.0.0['user_roles'] == 1
     when: install_type == 'mariadb'
 
-  # FIXME: do this check on mariadb too
   - name: Check in DB, if not granted, the query will fail
     <<: *task_params
     mysql_query:
@@ -789,6 +800,20 @@
       - result is succeeded
     when: install_type == 'mysql'
 
+  - name: Check in DB (mariadb)
+    <<: *task_params
+    mysql_query:
+      <<: *mysql_params
+      query: "SELECT count(User) as user_roles FROM mysql.roles_mapping WHERE User = '{{ role1 }}' AND Role = '{{ role0 }}'"
+    when: install_type == 'mariadb'
+
+  - name: Check (mariadb)
+    assert:
+      that:
+      - result.query_result.0.0['user_roles'] == 1
+    when: install_type == 'mariadb'
+
+
   #==========================
 
   - name: Rewrite members again in check_mode