From 7bbe80697c9d510bc0ced983cde1ccf2dd32fcd2 Mon Sep 17 00:00:00 2001
From: Matthieu Bourgain <aohzan@gmail.com>
Date: Wed, 24 Apr 2024 10:37:32 +0200
Subject: [PATCH] review

---
 .../tasks/test_user_plugin_auth.yml           | 73 ++++++++-----------
 1 file changed, 29 insertions(+), 44 deletions(-)

diff --git a/tests/integration/targets/test_mysql_user/tasks/test_user_plugin_auth.yml b/tests/integration/targets/test_mysql_user/tasks/test_user_plugin_auth.yml
index 60314c7..b5ed6c5 100644
--- a/tests/integration/targets/test_mysql_user/tasks/test_user_plugin_auth.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/test_user_plugin_auth.yml
@@ -483,25 +483,25 @@
     - name: Plugin auth | Create user with plugin auth and salt
       community.mysql.mysql_user:
         <<: *mysql_params
-        name: '{{ test_user_name }}'
-        host: '%'
+        name: "{{ test_user_name }}"
+        host: "%"
         plugin: caching_sha2_password
-        plugin_auth_string: '{{ test_plugin_auth_string }}'
-        salt: '{{ test_salt }}'
-        priv: '{{ test_default_priv }}'
+        plugin_auth_string: "{{ test_plugin_auth_string }}"
+        salt: "{{ test_salt }}"
+        priv: "{{ test_default_priv }}"
 
     - name: Plugin auth | Connect with user and password
-      ansible.builtin.command: "{{ mysql_command }} -u {{ test_user_name }} -p{{ test_plugin_auth_string }} -e \"SELECT 1\""
+      ansible.builtin.command: '{{ mysql_command }} -u {{ test_user_name }} -p{{ test_plugin_auth_string }} -e "SELECT 1"'
 
     - name: Plugin auth | Alter user with same plugin auth and same salt
       community.mysql.mysql_user:
         <<: *mysql_params
-        name: '{{ test_user_name }}'
-        host: '%'
+        name: "{{ test_user_name }}"
+        host: "%"
         plugin: caching_sha2_password
-        plugin_auth_string: '{{ test_plugin_auth_string }}'
-        salt: '{{ test_salt }}'
-        priv: '{{ test_default_priv }}'
+        plugin_auth_string: "{{ test_plugin_auth_string }}"
+        salt: "{{ test_salt }}"
+        priv: "{{ test_default_priv }}"
       register: result
       failed_when: result is changed
 
@@ -510,52 +510,37 @@
       vars:
         user_name: "{{ test_user_name }}"
 
-    - name: Plugin auth | Create user with too short salt
+    - name: Plugin auth | Create user with too short salt (should fail)
       community.mysql.mysql_user:
         <<: *mysql_params
-        name: '{{ test_user_name }}'
-        host: '%'
+        name: "{{ test_user_name }}"
+        host: "%"
         plugin: caching_sha2_password
-        plugin_auth_string: '{{ test_plugin_auth_string }}'
-        salt: '1234567890az'
-        priv: '{{ test_default_priv }}'
+        plugin_auth_string: "{{ test_plugin_auth_string }}"
+        salt: "1234567890az"
+        priv: "{{ test_default_priv }}"
       register: result
-      ignore_errors: true
-
-    - name: Plugin auth | Assert that shorter salt fails
-      ansible.builtin.assert:
-        that:
-          - result is failed
+      failed_when: result is success
 
     - name: Plugin auth | Create user with salt and no plugin auth string (should fail)
       community.mysql.mysql_user:
         <<: *mysql_params
-        name: '{{ test_user_name }}'
-        host: '%'
+        name: "{{ test_user_name }}"
+        host: "%"
         plugin: caching_sha2_password
-        salt: '{{ test_salt }}'
-        priv: '{{ test_default_priv }}'
+        salt: "{{ test_salt }}"
+        priv: "{{ test_default_priv }}"
       register: result
-      ignore_errors: true
-
-    - name: Plugin auth | Assert that missing plugin_auth_string with salt fails
-      ansible.builtin.assert:
-        that:
-          - result is failed
+      failed_when: result is success
 
     - name: Plugin auth | Create user with salt and plugin not handled by internal hash generation (should fail)
       community.mysql.mysql_user:
         <<: *mysql_params
-        name: '{{ test_user_name }}'
-        host: '%'
+        name: "{{ test_user_name }}"
+        host: "%"
         plugin: mysql_native_password
-        plugin_auth_string: '{{ test_plugin_auth_string }}'
-        salt: '{{ test_salt }}'
-        priv: '{{ test_default_priv }}'
+        plugin_auth_string: "{{ test_plugin_auth_string }}"
+        salt: "{{ test_salt }}"
+        priv: "{{ test_default_priv }}"
       register: result
-      ignore_errors: true
-
-    - name: Plugin auth | Assert that wrong plugin with salt fails
-      ansible.builtin.assert:
-        that:
-          - result is failed
+      failed_when: result is success