fix tests (include deprecation) (ansible-collections#554)

* tests: change deprecated "include" to "include_tasks" * tests: fix syntax --------- Co-authored-by: Felix Hamme <[email protected]>
FlorianPerrot · May 24, 2023 · 2fcfb10 · 2fcfb10
1 parent b6ad472
commit 2fcfb10
Show file tree

Hide file tree

Showing 19 changed files with 352 additions and 101 deletions.
diff --git a/tests/integration/targets/test_mysql_info/tasks/main.yml b/tests/integration/targets/test_mysql_info/tasks/main.yml
@@ -196,7 +196,7 @@
         name: acme
         state: absent
 
-    - include: issue-28.yml
+    - include_tasks: issue-28.yml
 
     # https://github.com/ansible-collections/community.mysql/issues/204
     - name: Create database containing only views

diff --git a/tests/integration/targets/test_mysql_query/tasks/main.yml b/tests/integration/targets/test_mysql_query/tasks/main.yml
@@ -6,4 +6,4 @@
 # mysql_query module initial CI tests
 - import_tasks: mysql_query_initial.yml
 
-- include: issue-28.yml
+- include_tasks: issue-28.yml
diff --git a/tests/integration/targets/test_mysql_replication/tasks/main.yml b/tests/integration/targets/test_mysql_replication/tasks/main.yml
@@ -10,7 +10,7 @@
 - import_tasks: mysql_replication_initial.yml
 
 # Tests of replication filters and force_context
-- include: issue-265.yml
+- include_tasks: issue-265.yml
 
 # Tests of primary_delay parameter:
 - import_tasks: mysql_replication_primary_delay.yml
@@ -24,4 +24,4 @@
 # Tests of resetprimary mode:
 - import_tasks: mysql_replication_resetprimary_mode.yml
 
-- include: issue-28.yml
+- include_tasks: issue-28.yml
diff --git a/tests/integration/targets/test_mysql_role/tasks/main.yml b/tests/integration/targets/test_mysql_role/tasks/main.yml
@@ -12,5 +12,9 @@
 
 # Test that subtract_privs will only revoke the grants given by priv
 # (https://github.com/ansible-collections/community.mysql/issues/331)
-- include: test_priv_subtract.yml enable_check_mode=no
-- include: test_priv_subtract.yml enable_check_mode=yes
+- include_tasks: test_priv_subtract.yml
+  vars:
+    enable_check_mode: no
+- include_tasks: test_priv_subtract.yml
+  vars:
+    enable_check_mode: yes
diff --git a/tests/integration/targets/test_mysql_user/tasks/issue-265.yml b/tests/integration/targets/test_mysql_user/tasks/issue-265.yml
@@ -31,7 +31,10 @@
         that:
           - result is changed
 
-    - include: utils/assert_user.yml user_name={{ user_name_1 }} user_host=localhost
+    - include_tasks: utils/assert_user.yml
+      vars:
+        user_name: "{{ user_name_1 }}"
+        user_host: localhost
 
     # Test user removal
     - name: Issue-265 | remove mysql user {{ user_name_1 }}
@@ -86,7 +89,9 @@
         that:
           - result is not changed
 
-    - include: utils/assert_no_user.yml user_name={{user_name_1}}
+    - include_tasks: utils/assert_no_user.yml
+      vars:
+        user_name: "{{user_name_1}}"
 
     # Tests with force_context: no
     # Test user creation
@@ -114,7 +119,10 @@
         that:
           - result is changed
 
-    - include: utils/assert_user.yml user_name={{ user_name_1 }} user_host=localhost
+    - include_tasks: utils/assert_user.yml
+      vars:
+        user_name: "{{ user_name_1 }}"
+        user_host: localhost
 
     # Test user removal
     - name: Issue-265 | Remove mysql user {{ user_name_1 }}
@@ -168,4 +176,6 @@
         that:
           - result is not changed
 
-    - include: utils/assert_no_user.yml user_name={{ user_name_1 }}
+    - include_tasks: utils/assert_no_user.yml
+      vars:
+        user_name: "{{ user_name_1 }}"
diff --git a/tests/integration/targets/test_mysql_user/tasks/issue-29511.yaml b/tests/integration/targets/test_mysql_user/tasks/issue-29511.yaml
@@ -79,4 +79,6 @@
         - foo
         - bar
 
-    - include: utils/remove_user.yml user_name="{{ user_name_2 }}"
+    - include_tasks: utils/remove_user.yml
+      vars:
+        user_name: "{{ user_name_2 }}"
diff --git a/tests/integration/targets/test_mysql_user/tasks/main.yml b/tests/integration/targets/test_mysql_user/tasks/main.yml
@@ -35,13 +35,13 @@
 
   block:
 
-    - include: issue-121.yml
+    - include_tasks: issue-121.yml
 
-    - include: issue-28.yml
+    - include_tasks: issue-28.yml
 
-    - include: test_resource_limits.yml
+    - include_tasks: test_resource_limits.yml
 
-    - include: test_idempotency.yml
+    - include_tasks: test_idempotency.yml
 
     # ============================================================
     # Create user with no privileges and verify default privileges are assign
@@ -54,11 +54,20 @@
         state: present
       register: result
 
-    - include: utils/assert_user.yml user_name={{ user_name_1 }} user_host=localhost priv=USAGE
+    - include_tasks: utils/assert_user.yml
+      vars:
+        user_name: "{{ user_name_1 }}"
+        user_host: localhost
+        priv: USAGE
 
-    - include: utils/remove_user.yml user_name={{ user_name_1 }}
+    - include_tasks: utils/remove_user.yml
+      vars:
+        user_name: "{{ user_name_1 }}"
+
+    - include_tasks: utils/assert_no_user.yml
+      vars:
+        user_name: "{{ user_name_1 }}"
 
-    - include: utils/assert_no_user.yml user_name={{ user_name_1 }}
 
     # ============================================================
     # Create user with select privileges and verify select privileges are assign
@@ -72,11 +81,20 @@
         priv: '*.*:SELECT'
       register: result
 
-    - include: utils/assert_user.yml user_name={{ user_name_2 }} user_host=localhost priv=SELECT
+    - include_tasks: utils/assert_user.yml
+      vars:
+        user_name: "{{ user_name_2 }}"
+        user_host: localhost
+        priv: SELECT
+
+    - include_tasks: utils/remove_user.yml
+      vars:
+        user_name: "{{ user_name_2 }}"
 
-    - include: utils/remove_user.yml user_name={{ user_name_2 }}
+    - include_tasks: utils/assert_no_user.yml
+      vars:
+        user_name: "{{ user_name_2 }}"
 
-    - include: utils/assert_no_user.yml user_name={{ user_name_2 }}
 
     # ============================================================
     # Assert user has access to multiple databases
@@ -112,9 +130,13 @@
           - "'{{ item }}' in result.stdout"
       with_items: "{{db_names}}"
 
-    - include: utils/remove_user.yml user_name={{ user_name_1 }}
+    - include_tasks: utils/remove_user.yml
+      vars:
+        user_name: "{{ user_name_1 }}"
 
-    - include: utils/remove_user.yml user_name={{ user_name_2 }}
+    - include_tasks: utils/remove_user.yml
+      vars:
+        user_name: "{{ user_name_2 }}"
 
     - name: Give user SELECT access to database via wildcard
       mysql_user:
@@ -172,59 +194,81 @@
           - "'%db' in result.stdout"
           - "'INSERT' in result.stdout"
 
-    - include: utils/remove_user.yml user_name={{user_name_1}}
+    - include_tasks: utils/remove_user.yml
+      vars:
+        user_name: "{{user_name_1}}"
 
     # ============================================================
     # Test plaintext and encrypted password scenarios.
     #
-    - include: test_user_password.yml
+    - include_tasks: test_user_password.yml
 
     # ============================================================
     # Test plugin authentication scenarios.
     #
     # FIXME: mariadb sql syntax for create/update user is not compatible
-    - include: test_user_plugin_auth.yml
+    - include_tasks: test_user_plugin_auth.yml
       when: db_engine == 'mysql'
 
     # ============================================================
     # Assert create user with SELECT privileges, attempt to create database and update privileges to create database
     #
-    - include: test_privs.yml current_privilege=SELECT current_append_privs=no
+    - include_tasks: test_privs.yml
+      vars:
+        current_privilege: SELECT
+        current_append_privs: no
 
     # ============================================================
     # Assert creating user with SELECT privileges, attempt to create database and append privileges to create database
     #
-    - include: test_privs.yml current_privilege=DROP current_append_privs=yes
+    - include_tasks: test_privs.yml
+      vars:
+        current_privilege: DROP
+        current_append_privs: yes
 
     # ============================================================
     # Assert create user with SELECT privileges, attempt to create database and update privileges to create database
     #
-    - include: test_privs.yml current_privilege='UPDATE,ALTER' current_append_privs=no
+    - include_tasks: test_privs.yml
+      vars:
+        current_privilege: 'UPDATE,ALTER'
+        current_append_privs: no
 
     # ============================================================
     # Assert creating user with SELECT privileges, attempt to create database and append privileges to create database
     #
-    - include: test_privs.yml current_privilege='INSERT,DELETE' current_append_privs=yes
+    - include_tasks: test_privs.yml
+      vars:
+        current_privilege: 'INSERT,DELETE'
+        current_append_privs: yes
 
     # Tests for the priv parameter with dict value (https://github.com/ansible/ansible/issues/57533)
-    - include: test_priv_dict.yml
+    - include_tasks: test_priv_dict.yml
 
     # Test that append_privs will not attempt to make a change where current privileges are a superset of new privileges
     # (https://github.com/ansible-collections/community.mysql/issues/69)
-    - include: test_priv_append.yml enable_check_mode=no
-    - include: test_priv_append.yml enable_check_mode=yes
+    - include_tasks: test_priv_append.yml
+      vars:
+        enable_check_mode: no
+    - include_tasks: test_priv_append.yml
+      vars:
+        enable_check_mode: yes
 
     # Test that subtract_privs will only revoke the grants given by priv
     # (https://github.com/ansible-collections/community.mysql/issues/331)
-    - include: test_priv_subtract.yml enable_check_mode=no
-    - include: test_priv_subtract.yml enable_check_mode=yes
+    - include_tasks: test_priv_subtract.yml
+      vars:
+        enable_check_mode: no
+    - include_tasks: test_priv_subtract.yml
+      vars:
+        enable_check_mode: yes
 
     - import_tasks: test_privs_issue_465.yml
       tags:
         - issue_465
 
     # Tests for the TLS requires dictionary
-    - include: test_tls_requirements.yml
+    - include_tasks: test_tls_requirements.yml
 
     - import_tasks: issue-29511.yaml
       tags:
@@ -236,9 +280,9 @@
 
     # Test that mysql_user still works with force_context enabled (database set to "mysql")
     # (https://github.com/ansible-collections/community.mysql/issues/265)
-    - include: issue-265.yml
+    - include_tasks: issue-265.yml
 
     # https://github.com/ansible-collections/community.mysql/issues/231
-    - include: test_user_grants_with_roles_applied.yml
+    - include_tasks: test_user_grants_with_roles_applied.yml
 
-    - include: test_revoke_only_grant.yml
+    - include_tasks: test_revoke_only_grant.yml
diff --git a/tests/integration/targets/test_mysql_user/tasks/test_idempotency.yml b/tests/integration/targets/test_mysql_user/tasks/test_idempotency.yml
@@ -10,7 +10,10 @@
     # ========================================================================
     # Creation
     # ========================================================================
-    - include: utils/create_user.yml user_name={{ user_name_1 }} user_password={{ user_password_1 }}
+    - include_tasks: utils/create_user.yml
+      vars:
+        user_name: "{{ user_name_1 }}"
+        user_password: "{{ user_password_1 }}"
 
     - name: Idempotency | Create user that already exist (expect changed=false)
       mysql_user:
@@ -55,7 +58,10 @@
     # ========================================================================
 
     # Create blank  user to be removed later
-    - include: utils/create_user.yml user_name="" user_password='KJFDY&D*Sfuysf'
+    - include_tasks: utils/create_user.yml
+      vars:
+        user_name: ""
+        user_password: 'KJFDY&D*Sfuysf'
 
     - name: Idempotency | Remove blank  user with hosts=all (expect changed)
       mysql_user:

diff --git a/tests/integration/targets/test_mysql_user/tasks/test_priv_append.yml b/tests/integration/targets/test_mysql_user/tasks/test_priv_append.yml
@@ -131,4 +131,6 @@
         - data1
         - data2
 
-    - include: utils/remove_user.yml user_name={{ user_name_4 }}
+    - include_tasks: utils/remove_user.yml
+      vars:
+        user_name: "{{ user_name_4 }}"
diff --git a/tests/integration/targets/test_mysql_user/tasks/test_priv_dict.yml b/tests/integration/targets/test_mysql_user/tasks/test_priv_dict.yml
@@ -151,4 +151,6 @@
         - data2
         - data3
 
-    - include: utils/remove_user.yml user_name="{{ user_name_3 }}"
+    - include_tasks: utils/remove_user.yml
+      vars:
+        user_name: "{{ user_name_3 }}"
diff --git a/tests/integration/targets/test_mysql_user/tasks/test_priv_subtract.yml b/tests/integration/targets/test_mysql_user/tasks/test_priv_subtract.yml
@@ -172,4 +172,6 @@
       loop:
         - data1
 
-    - include: utils/remove_user.yml user_name="{{ user_name_4 }}"
+    - include_tasks: utils/remove_user.yml
+      vars:
+        user_name: "{{ user_name_4 }}"
diff --git a/tests/integration/targets/test_mysql_user/tasks/test_privs.yml b/tests/integration/targets/test_mysql_user/tasks/test_privs.yml
@@ -37,7 +37,11 @@
         state: present
       when: current_append_privs ==  "yes"
 
-    - include: utils/assert_user.yml user_name={{ user_name_2 }} user_host=% priv='SELECT'
+    - include_tasks: utils/assert_user.yml
+      vars:
+        user_name: "{{ user_name_2 }}"
+        user_host: "%"
+        priv: 'SELECT'
       when: current_append_privs ==  "yes"
 
     - name: Privs | Create user with current privileges (expect changed=true)
@@ -132,7 +136,7 @@
         priv: '*.*:ALL'
         state: present
 
-    # - include: utils/assert_user.yml user_name={{user_name_2}} user_host=% priv='ALL PRIVILEGES'
+    # - include_tasks: utils/assert_user.yml user_name={{user_name_2}} user_host=% priv='ALL PRIVILEGES'
 
     - name: Privs | Create database using user {{ user_name_2 }}
       mysql_db:
@@ -188,7 +192,9 @@
         that:
           - result is not changed
 
-    - include: utils/remove_user.yml user_name="{{ user_name_2 }}"
+    - include_tasks: utils/remove_user.yml
+      vars:
+        user_name: "{{ user_name_2 }}"
 
     # ============================================================
     - name: Privs | Grant all privileges with grant option
@@ -259,4 +265,6 @@
           - result is failed
           - "'Error granting privileges' in result.msg"
 
-    - include: utils/remove_user.yml user_name="{{ user_name_2 }}"
+    - include_tasks: utils/remove_user.yml
+      vars:
+        user_name: "{{ user_name_2 }}"
diff --git a/tests/integration/targets/test_mysql_user/tasks/test_revoke_only_grant.yml b/tests/integration/targets/test_mysql_user/tasks/test_revoke_only_grant.yml
@@ -6,7 +6,9 @@
       login_host: '{{ mysql_host }}'
       login_port: '{{ mysql_primary_port }}'
   block:
-    - include: utils/remove_user.yml user_name={{ user_name_1 }}
+    - include_tasks: utils/remove_user.yml
+      vars:
+        user_name: "{{ user_name_1 }}"
 
     - name: Revoke only grants | Create user with two grants
       mysql_user:
@@ -47,4 +49,6 @@
           - result is not changed
 
   always:
-    - include: utils/remove_user.yml user_name={{ user_name_1 }}
+    - include_tasks: utils/remove_user.yml
+      vars:
+        user_name: "{{ user_name_1 }}"