Is changed (#427)

* Refactor tests to use "is" and "is not" changed

* Refactor tests to use is succeeded or is failed

* Reformat indentation

* Add filter "bool" to prevent issues

tests/integration/targets/test_mysql_user/tasks/assert_user_password.yml

@@ -13,7 +13,7 @@
 - name: assert a change occurred
   assert:
     that:
-      - "result.changed == {{ expect_change }}"
+      - "result.changed | bool == {{ expect_change }} | bool"
       - "result.password_changed == {{ expect_password_change }}"
 - name: query the user
   command: "{{ mysql_command }} -BNe \"SELECT plugin, authentication_string FROM mysql.user where user='{{ username }}' and host='{{ host }}'\""

tests/integration/targets/test_mysql_user/tasks/create_user.yml

@@ -43,4 +43,4 @@
     - name: assert output message mysql user was created
       assert:
         that:
-          - "result.changed == true"
+          - result is changed

tests/integration/targets/test_mysql_user/tasks/issue-265.yml

@@ -28,7 +28,7 @@
     - name: assert output message mysql user was created
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - include: assert_user.yml user_name={{user_name_1}}
 
@@ -45,7 +45,7 @@
     - name: assert output message mysql user was removed
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     # Test blank user removal
     - name: create blank mysql user to be removed later
@@ -68,7 +68,7 @@
     - name: assert changed is true for removing all blank users
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - name: remove blank mysql user with hosts=all (expect ok)
       mysql_user:
@@ -82,7 +82,7 @@
     - name: assert changed is true for removing all blank users
       assert:
         that:
-          - "result.changed == false"
+          - result is not changed
 
     - include: assert_no_user.yml user_name={{user_name_1}}
 
@@ -109,7 +109,7 @@
     - name: assert output message mysql user was created
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - include: assert_user.yml user_name={{user_name_1}}
 
@@ -126,7 +126,7 @@
     - name: assert output message mysql user was removed
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     # Test blank user removal
     - name: create blank mysql user to be removed later
@@ -149,7 +149,7 @@
     - name: assert changed is true for removing all blank users
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - name: remove blank mysql user with hosts=all (expect ok)
       mysql_user:
@@ -163,6 +163,6 @@
     - name: assert changed is true for removing all blank users
       assert:
         that:
-          - "result.changed == false"
+          - result is not changed
 
     - include: assert_no_user.yml user_name={{user_name_1}}

tests/integration/targets/test_mysql_user/tasks/issue-64560.yaml

@@ -17,7 +17,9 @@
       register: result
 
     - name: assert root password is changed
-      assert: { that: "result.changed == true" }
+      assert:
+        that:
+          - result is changed
 
     - name: Set root password again
       mysql_user:
@@ -31,7 +33,9 @@
       register: result
 
     - name: Assert root password is not changed
-      assert: { that: "result.changed == false" }
+      assert:
+        that:
+          - result is not changed
 
     - name: Set root password again
       mysql_user:

tests/integration/targets/test_mysql_user/tasks/main.yml

@@ -65,7 +65,9 @@
       register: result
 
     - name: assert output message mysql user was not created
-      assert: { that: "result.changed == false" }
+      assert:
+        that:
+          - result is not changed
 
     # ============================================================
     # remove mysql user and verify user is removed from mysql database
@@ -81,7 +83,7 @@
     - name: assert output message mysql user was removed
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - include: assert_no_user.yml user_name={{user_name_1}}
 
@@ -99,7 +101,7 @@
     - name: assert output message mysql user that does not exist
       assert:
         that:
-          - "result.changed == false"
+          - result is not changed
 
     - include: assert_no_user.yml user_name={{user_name_1}}
 

tests/integration/targets/test_mysql_user/tasks/remove_user.yml

@@ -37,7 +37,7 @@
     - name: assert output message mysql user was removed
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     # ============================================================
     - name: create blank mysql user to be removed later
@@ -58,7 +58,7 @@
     - name: assert changed is true for removing all blank users
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - name: remove blank mysql user with hosts=all (expect ok)
       mysql_user:
@@ -71,4 +71,4 @@
     - name: assert changed is true for removing all blank users
       assert:
         that:
-          - "result.changed == false"
+          - result is not changed

tests/integration/targets/test_mysql_user/tasks/test_priv_append.yml

@@ -50,7 +50,7 @@
     - name: Assert that there wasn't a change in permissions
       assert:
         that:
-          - "result.changed == false"
+          - result is not changed
 
     - name: Run command to show privileges for user (expect privileges in stdout)
       command: "{{ mysql_command }} -e \"SHOW GRANTS FOR '{{ user_name_4 }}'@'localhost'\""
@@ -76,7 +76,7 @@
     - name: Assert that there was a change because permissions were added to data1.*
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - name: Run command to show privileges for user (expect privileges in stdout)
       command: "{{ mysql_command }} -e \"SHOW GRANTS FOR '{{ user_name_4 }}'@'localhost'\""

tests/integration/targets/test_mysql_user/tasks/test_priv_subtract.yml

@@ -47,7 +47,7 @@
     - name: Assert that there wasn't a change in permissions
       assert:
         that:
-          - "result.changed == false"
+          - result is not changed
 
     - name: Run command to show privileges for user (expect privileges in stdout)
       command: "{{ mysql_command }} -e \"SHOW GRANTS FOR '{{ user_name_4 }}'@'localhost'\""
@@ -72,7 +72,7 @@
     - name: Assert that there was a change because permissions were/would be revoked on data1.*
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - name: Run command to show privileges for user (expect privileges in stdout)
       command: "{{ mysql_command }} -e \"SHOW GRANTS FOR '{{ user_name_4 }}'@'localhost'\""
@@ -104,7 +104,7 @@
     - name: Assert that there was no change because invalid permissions are ignored
       assert:
         that:
-          - "result.changed == false"
+          - result is not changed
 
     - name: Run command to show privileges for user (expect privileges in stdout)
       command: "{{ mysql_command }} -e \"SHOW GRANTS FOR '{{ user_name_4 }}'@'localhost'\""

tests/integration/targets/test_mysql_user/tasks/test_privs.yml

@@ -51,7 +51,7 @@
     - name: assert output message for current privileges
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - name: run command to show privileges for user (expect privileges in stdout)
       command: "{{ mysql_command }} -e \"SHOW GRANTS FOR '{{user_name_2}}'@'localhost'\""
@@ -101,7 +101,7 @@
     - name: Assert that priv changed
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - name: Add privs to a specific table (expect ok)
       mysql_user:
@@ -115,7 +115,7 @@
     - name: Assert that priv did not change
       assert:
         that:
-          - "result.changed == false"
+          - result is not changed
 
     # ============================================================
     - name: update user with all privileges
@@ -162,7 +162,7 @@
     - name: Assert that priv changed
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - name: Test idempotency (expect ok)
       mysql_user:
@@ -177,7 +177,7 @@
     - name: Assert that priv did not change
       assert:
         that:
-          - "result.changed == false"
+          - result is not changed
       when: install_type == 'mysql' or (install_type == 'mariadb' and mariadb_version is version('10.2', '=='))
 
     # ============================================================

tests/integration/targets/test_mysql_user/tasks/test_user_password.yml

@@ -32,7 +32,7 @@
     - name: Assert that a change occurred because the user was added
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - include: assert_user.yml user_name={{ test_user_name }} priv={{ test_default_priv_type }}
 
@@ -49,7 +49,7 @@
     - name: Assert that mysql_info was successful
       assert:
         that:
-          - "result.failed == false"
+          - result is succeeded
 
     - name: Run mysql_user again without any changes
       mysql_user:
@@ -63,7 +63,7 @@
     - name: Assert that there weren't any changes because username/password didn't change
       assert:
         that:
-          - "result.changed == false"
+          - result is not changed
 
     - include: assert_user.yml user_name={{ test_user_name }} priv={{ test_default_priv_type }}
 
@@ -78,7 +78,7 @@
     - name: Assert that a change occurred because the password was updated
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - include: assert_user.yml user_name={{ test_user_name }} priv={{ test_default_priv_type }}
 
@@ -95,7 +95,7 @@
     - name: Assert that the mysql_info module failed because we used the old password
       assert:
         that:
-          - "result.failed == true"
+          - result is failed
 
     - name: Get the MySQL version data using the new password (should work)
       mysql_info:
@@ -110,7 +110,7 @@
     - name: Assert that the mysql_info module succeeded because we used the new password
       assert:
         that:
-          - "result.failed == false"
+          - result is succeeded
 
     # Cleanup
     - include: remove_user.yml user_name={{ test_user_name }} user_password={{ new_password }}
@@ -131,7 +131,7 @@
     - name: Assert that a change occurred because the user was added
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - include: assert_user.yml user_name={{ test_user_name }} priv={{ test_default_priv_type }}
 
@@ -148,7 +148,7 @@
     - name: Assert that there weren't any changes because username/password didn't change
       assert:
         that:
-          - "result.changed == false"
+          - result is not changed
 
     # Cleanup
     - include: remove_user.yml user_name={{ test_user_name }} user_password={{ new_password }}
@@ -170,7 +170,7 @@
     - name: Assert that a change occurred because the user was added
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - include: assert_user.yml user_name={{ test_user_name }} priv={{ test_default_priv_type }}
 
@@ -187,7 +187,7 @@
     - name: Assert that the mysql_info module succeeded because we used the new password
       assert:
         that:
-          - "result.failed == false"
+          - result is succeeded
 
     - name: Pass in the same password as before, but in the encrypted form (no change expected)
       mysql_user:
@@ -200,7 +200,7 @@
     - name: Assert that there weren't any changes because username/password didn't change
       assert:
         that:
-          - "result.changed == false"
+          - result is not changed
 
     # Cleanup
     - include: remove_user.yml user_name={{ test_user_name }} user_password={{ new_password }}
@@ -220,7 +220,7 @@
     - name: Assert that a change occurred because the user was added
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - name: Get the MySQL version using an empty password for the newly created user
       mysql_info:
@@ -235,7 +235,7 @@
     - name: Assert that mysql_info was successful
       assert:
         that:
-          - "result.failed == false"
+          - result is succeeded
 
     - name: Get the MySQL version using an non-empty password (should fail)
       mysql_info:
@@ -250,7 +250,7 @@
     - name: Assert that mysql_info failed
       assert:
         that:
-          - "result.failed == true"
+          - result is failed
 
     - name: Update the user without changing the password
       mysql_user:
@@ -263,7 +263,7 @@
     - name: Assert that the user wasn't changed because the password is still empty
       assert:
         that:
-          - "result.changed == false"
+          - result is not changed
 
     # Cleanup
     - include: remove_user.yml user_name={{ test_user_name }} user_password=''

tests/integration/targets/test_mysql_user/tasks/test_user_plugin_auth.yml

@@ -37,7 +37,7 @@
     - name: Check that the module made a change
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - name: Check that the expected plugin type is set
       assert:
@@ -59,7 +59,7 @@
     - name: Assert that mysql_info was successful
       assert:
         that:
-          - "result.failed == false"
+          - result is succeeded
 
     - name: Update the user with a different hash
       mysql_user:
@@ -72,7 +72,7 @@
     - name: Check that the module makes the change because the hash changed
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - include: assert_user.yml user_name={{ test_user_name }} priv={{ test_default_priv_type }}
 
@@ -88,7 +88,7 @@
     - name: Assert that mysql_info was successful
       assert:
         that:
-          - "result.failed == false"
+          - result is succeeded
 
     # Cleanup
     - include: remove_user.yml user_name={{ test_user_name }} user_password={{ test_plugin_new_auth_string }}
@@ -113,7 +113,7 @@
     - name: Check that the module made a change
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - name: Check that the expected plugin type is set
       assert:
@@ -135,7 +135,7 @@
     - name: Assert that mysql_info was successful
       assert:
         that:
-          - "result.failed == false"
+          - result is succeeded
 
     - name: Update the user with the same hash (no change expected)
       mysql_user:
@@ -149,7 +149,7 @@
     - name: Check that the module doesn't make a change when the same hash is passed in
       assert:
         that:
-          - "result.changed == false"
+          - result is not changed
       when: install_type == 'mysql' or (install_type == 'mariadb' and mariadb_version is version('10.3', '>='))
 
     - include: assert_user.yml user_name={{ test_user_name }} priv={{ test_default_priv_type }}
@@ -166,7 +166,7 @@
     - name: Check that the module did not change the password
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - name: Getting the MySQL info should still work
       mysql_info:
@@ -180,7 +180,7 @@
     - name: Assert that mysql_info was successful
       assert:
         that:
-          - "result.failed == false"
+          - result is succeeded
 
     # Cleanup
     - include: remove_user.yml user_name={{ test_user_name }} user_password={{ test_plugin_auth_string }}
@@ -205,7 +205,7 @@
     - name: Check that the module made a change
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - name: Check that the expected plugin type is set
       assert:
@@ -227,7 +227,7 @@
     - name: Assert that mysql_info was successful
       assert:
         that:
-          - "result.failed == false"
+          - result is succeeded
 
     - name: Update the user with the same auth string
       mysql_user:
@@ -242,7 +242,7 @@
     - name: The module should detect a change even though the password is the same
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - include: assert_user.yml user_name={{ test_user_name }} priv={{ test_default_priv_type }}
 
@@ -257,7 +257,7 @@
     - name: Check that the module did not change the password
       assert:
         that:
-          - "result.changed == false"
+          - result is not changed
 
     - name: Get the MySQL version using the newly created creds
       mysql_info:
@@ -271,7 +271,7 @@
     - name: Assert that mysql_info was successful
       assert:
         that:
-          - "result.failed == false"
+          - result is succeeded
 
     # Cleanup
     - include: remove_user.yml user_name={{ test_user_name }} user_password={{ test_plugin_auth_string }}
@@ -295,7 +295,7 @@
     - name: Check that the module made a change
       assert:
         that:
-          - "result.changed == true"
+          - result is changed
 
     - name: Check that the expected plugin type is set
       assert:
@@ -318,7 +318,7 @@
     - name: Assert that mysql_info was successful
       assert:
         that:
-          - "result.failed == false"
+          - result is succeeded
 
     - name: Get the MySQL version using an non-empty password (should fail)
       mysql_info:
@@ -333,7 +333,7 @@
     - name: Assert that mysql_info failed
       assert:
         that:
-          - "result.failed == true"
+          - result is failed
 
     - name: Update the user without changing the auth mechanism
       mysql_user:
@@ -346,7 +346,7 @@
     - name: Assert that the user wasn't changed because the auth string is still empty
       assert:
         that:
-          - "result.changed == false"
+          - result is not changed
 
     # Cleanup
     - include: remove_user.yml user_name={{ test_user_name }} user_password={{ test_plugin_auth_string }}
@@ -381,7 +381,7 @@
       - name: Check that the module made a change
         assert:
           that:
-            - "result.changed == true"
+            - result is changed
 
       - name: Check that the expected plugin type is set
         assert:
@@ -406,7 +406,7 @@
       - name: Check that the module made a change
         assert:
           that:
-            - "result.changed == true"
+            - result is changed
 
       - name: Check that the expected plugin type is set
         assert: