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

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

@@ -14,7 +14,12 @@
 - name: Add blank line
   shell: 'echo "" >> {{ config_file }}'
   when:
-  - (connector.name.0 is search('pymysql') and connector_ver is version('0.9.3', '>=')) or connector.name.0 is not search('pymysql')
+    - >
+      connector_name is not search('pymysql')
+      or (
+        connector_name is search('pymysql')
+        and connector_ver is version('0.9.3', '>=')
+      )
 
 - name: Create include_dir
   file:
@@ -22,7 +27,12 @@
     state: directory
     mode: '0777'
   when:
-  - (connector.name.0 is search('pymysql') and connector_ver is version('0.9.3', '>=')) or connector.name.0 is not search('pymysql')
+    - >
+      connector_name is not search('pymysql')
+      or (
+        connector_name is search('pymysql')
+        and connector_ver is version('0.9.3', '>=')
+      )
 
 - name: Add include_dir
   lineinfile:
@@ -30,7 +40,12 @@
     line: '!includedir {{ include_dir }}'
     insertafter: EOF
   when:
-  - (connector.name.0 is search('pymysql') and connector_ver is version('0.9.3', '>=')) or connector.name.0 is not search('pymysql')
+    - >
+      connector_name is not search('pymysql')
+      or (
+        connector_name is search('pymysql')
+        and connector_ver is version('0.9.3', '>=')
+      )
 
 - name: Create database using fake port to connect to, must fail
   mysql_db:

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

@@ -52,12 +52,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_db:

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

@@ -54,12 +54,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_info:

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

@@ -54,12 +54,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_query:

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

@@ -55,12 +55,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_replication:

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

@@ -218,10 +218,13 @@
         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
+          - result is not changed
-      when: (pymysql_version.stdout | default('1000', true)) is version('0.9.3', '<=')
+      when:
+        - connector_name is search('pymysql')
+        - connector_ver is version('0.9.3', '<=')
 
     # Test stopreplica mode:
     - name: Stop replica
@@ -247,8 +250,7 @@
 
     - assert:
         that:
-        - result is not changed
+          - result is not changed
-      when: (pymysql_version.stdout | default('1000', true)) is version('0.9.3', '<=')
 
     # master / slave related choices were removed in 3.0.0
     # https://github.com/ansible-collections/community.mysql/pull/252

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

@@ -53,12 +53,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_user:

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

@@ -361,7 +361,13 @@
       register: pymysql_version
 
     - name: Test plugin auth switching which doesn't work on pymysql < 0.9
-      when: pymysql_version.stdout == "" or (pymysql_version.stdout != "" and pymysql_version.stdout is version('0.9', '>='))
+      when:
+        - >
+          connector_name is not search('pymysql')
+          or (
+            connector_name is search('pymysql')
+            and connector_ver is version('0.9', '>=')
+          )
       block:
 
       - name: Create user with plugin auth (empty auth string)

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

@@ -22,4 +22,4 @@
 - name: assert message failure (expect failed=true)
   assert:
     that:
-      - "output.failed == true"
+      - "output.failed | bool == true"

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

@@ -22,7 +22,7 @@
 - name: assert output message changed value
   assert:
     that:
-      - "output.changed == {{ changed }}"
+      - "output.changed | bool == changed | bool"
 
 - name: run mysql command to show variable
   command: "{{ mysql_command }} \"-e show variables like '{{ var_name }}'\""
@@ -31,6 +31,6 @@
 - name: assert output mysql variable name and value
   assert:
     that:
-      - "result.changed == true"
+      - "result.changed | bool == true"
       - "'{{ var_name }}' in result.stdout"
       - "'{{ var_value }}' in result.stdout"

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

@@ -22,7 +22,7 @@
 - name: assert output message changed value
   assert:
     that:
-      - "output.changed == {{ changed }}"
+      - "output.changed | bool == changed | bool"
 
 - set_fact:
     key_name: "{{ var_name }}"
@@ -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/mysql_variables.yml

@@ -155,7 +155,7 @@
       mysql_variables:
         <<: *mysql_params
         variable: max_connect_errors
-        value: -1
+        value: '-1'
       register: oor_result
       ignore_errors: true