Port stable 1 ci changes (#423) (#425)

* Add changes from stable-1 integrations tests (PR 418)

* Refactor to use connectors' info declared in setup_mysql

* Fix 2nd replication stop marked changed by mysqlclient

(cherry picked from commit 61586ae4cc)

tests/integration/targets/test_mysql_db/tasks/config_overrides_defaults.yml

@@ -20,6 +20,7 @@
         connector_name is search('pymysql')
         and connector_ver is version('0.9.3', '>=')
       )
+
 - name: Create include_dir
   file:
     path: '{{ include_dir }}'

tests/integration/targets/test_mysql_query/tasks/mysql_query_initial.yml

@@ -343,7 +343,7 @@
       that:
       # PyMySQL driver throws a warning, so the following is correct
       - result is not changed
-    when: connector.name.0 is search('pymysql')
+    when: connector_name is search('pymysql')
 
   # Issue https://github.com/ansible-collections/community.mysql/issues/268
   - assert:
@@ -352,7 +352,7 @@
       # if the state was changed or not.
       # We assume that it was for DDL queryes by default in the code
       - result is changed
-    when: connector.name.0 is search('mysqlclient')
+    when: connector_name is search('mysqlclient')
 
   - name: Drop db {{ test_db }}
     mysql_query:

tests/integration/targets/test_mysql_replication/tasks/mysql_replication_initial.yml

@@ -176,8 +176,8 @@
       shell: "echo \"INSERT INTO {{ test_table }} (id) VALUES (1), (2), (3); FLUSH LOGS;\" | {{ mysql_command }} -P{{ mysql_primary_port }} {{ test_db }}"
 
     - name: Small pause to be sure the bin log, which was flushed previously, reached the replica
-      pause:
-        seconds: 2
+      ansible.builtin.wait_for:
+        timeout: 2
 
     # Test master log pos has been changed:
     - name: Get replica status
@@ -207,13 +207,12 @@
         fail_on_error: true
       register: result
 
-    # Task is changed with mysqlclient 2.0.1 and pymysql 0.9.3
+    # mysqlclient 2.0.1 always return "changed"
     - assert:
         that:
           - result is not changed
       when:
-        - connector_name is search('pymysql')
-        - connector_ver is version('0.9.3', '<=')
+        - connector_name == 'pymysql'
 
     # Test stopreplica mode:
     - name: Stop replica using deprecated stopslave choice
@@ -228,7 +227,12 @@
         - result is changed
         - result.queries == ["STOP SLAVE"] or result.queries == ["STOP REPLICA"]
 
+    - name: Pause for 2 seconds to let the replication stop
+      ansible.builtin.wait_for:
+        timeout: 2
+
     # Test stopreplica mode:
+    # mysqlclient 2.0.1 always return "changed"
     - name: Stop replica that is no longer running
       mysql_replication:
         <<: *mysql_params
@@ -237,10 +241,8 @@
         fail_on_error: true
       register: result
 
-    # Task is changed with mysqlclient 2.0.1 and pymysql 0.9.3
     - assert:
         that:
           - result is not changed
       when:
-        - connector_name is search('pymysql')
-        - connector_ver is version('0.9.3', '<=')
+        - connector_name == 'pymysql'

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

@@ -334,7 +334,6 @@
     # plugins that are loaded by default are sha2*, but these aren't compatible with pymysql < 0.9, so skip these tests
     # for those versions.
     #
-
     - name: Test plugin auth switching which doesn't work on pymysql < 0.9
       when:
         - >

tests/integration/targets/test_mysql_variables/tasks/assert_var_output.yml

@@ -35,6 +35,6 @@
 - name: assert output variable info match mysql variable info
   assert:
     that:
-      - "result.changed == true"
+      - "result.changed | bool == true"
       - "key_name in result.stdout"
       - "key_value in result.stdout"

tests/integration/targets/test_mysql_variables/tasks/issue-28.yml

@@ -46,12 +46,12 @@
     - assert:
         that:
           - result is failed
-      when: connector.name.0 is search('pymysql')
+      when: connector_name is search('pymysql')
 
     - assert:
         that:
           - result is succeeded
-      when: connector.name.0 is not search('pymysql')
+      when: connector_name is not search('pymysql')
 
     - name: attempt connection with newly created user ignoring hostname
       mysql_variables:

tests/integration/targets/test_mysql_variables/tasks/mysql_variables.yml

@@ -161,10 +161,10 @@
       ignore_errors: true
 
     - include: assert_var.yml changed=true output={{ oor_result }} var_name=max_connect_errors var_value=1
-      when: connector.name.0 is not search('pymysql')
+      when: connector_name is not search('pymysql')
 
     - include: assert_fail_msg.yml output={{ oor_result }}  msg='Truncated incorrect'
-      when: connector.name.0 is search('pymysql')
+      when: connector_name is search('pymysql')
 
     # ============================================================
     # Verify mysql_variable fails when setting an incorrect value (incorrect type)