From 72db4f67ce5b101910ebe0aa010935918ecda4fc Mon Sep 17 00:00:00 2001
From: Andrew Klychkov <aklychko@redhat.com>
Date: Thu, 5 May 2022 11:28:37 +0200
Subject: [PATCH] Fix CI

---
 .../tasks/mysql_role_initial.yml              | 21 +++++++++++++++++++
 .../test_user_grants_with_roles_applied.yml   |  6 ++----
 2 files changed, 23 insertions(+), 4 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 1bca3ae..a2167c6 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
@@ -1540,3 +1540,24 @@
     - '{{ test_db }}'
     - '{{ test_db1 }}'
     - '{{ test_db2 }}'
+
+  - name: Drop users
+    <<: *task_params
+    mysql_user:
+      <<: *mysql_params
+      name: '{{ item }}'
+      state: absent
+    loop:
+    - '{{ user0 }}'
+    - '{{ user1 }}'
+    - '{{ user2 }}'
+
+  - name: Drop roles
+    <<: *task_params
+    mysql_role:
+      <<: *mysql_params
+      name: '{{ item }}'
+      state: absent
+    loop:
+    - '{{ role0 }}'
+    - test
diff --git a/tests/integration/targets/test_mysql_user/tasks/test_user_grants_with_roles_applied.yml b/tests/integration/targets/test_mysql_user/tasks/test_user_grants_with_roles_applied.yml
index 52f144d..8ee738e 100644
--- a/tests/integration/targets/test_mysql_user/tasks/test_user_grants_with_roles_applied.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/test_user_grants_with_roles_applied.yml
@@ -24,7 +24,6 @@
       loop:
       - data1
       - data2
-      - data3
 
     - name: Create user with privileges
       mysql_user:
@@ -49,7 +48,7 @@
     - name: Create role
       mysql_role:
         <<: *mysql_params
-        name: test
+        name: test231
         members:
         - '{{ user_name_3 }}@localhost'
 
@@ -82,7 +81,6 @@
       loop:
       - data1
       - data2
-      - data3
 
     - name: Drop test user
       mysql_user:
@@ -93,5 +91,5 @@
     - name: Drop test role
       mysql_role:
         <<: *mysql_params
-        name: test
+        name: test231
         state: absent