ansible-collections/community.mysql
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.mysql.git synced 2025-04-05 10:10:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Port stable 1 ci changes (#423)

Browse source 
* 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
This commit is contained in:
Laurent Indermühle 2022-08-16 09:15:50 +02:00 • committed by GitHub
parent 057f817111
commit 61586ae4cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 61 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tests/integration/targets/test_mysql_db/tasks/config_overrides_defaults.yml
View file

@ -14,7 +14,12 @@
- name: Add blank line - name: Add blank line
shell: 'echo "" >> {{ config_file }}' shell: 'echo "" >> {{ config_file }}'
when: 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 - name: Create include_dir
file: file:
@ -22,7 +27,12 @@
state: directory state: directory
mode: '0777' mode: '0777'
when: 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 - name: Add include_dir
lineinfile: lineinfile:
@ -30,7 +40,12 @@
line: '!includedir {{ include_dir }}' line: '!includedir {{ include_dir }}'
insertafter: EOF insertafter: EOF
when: 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 - name: Create database using fake port to connect to, must fail
mysql_db: mysql_db:

4
tests/integration/targets/test_mysql_db/tasks/issue-28.yml
View file

@ -52,12 +52,12 @@
- assert: - assert:
that: that:
- result is failed - result is failed
when: connector.name.0 is search('pymysql') when: connector_name is search('pymysql')
- assert: - assert:
that: that:
- result is succeeded - 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 - name: attempt connection with newly created user ignoring hostname
mysql_db: mysql_db:

4
tests/integration/targets/test_mysql_info/tasks/issue-28.yml
View file

@ -54,12 +54,12 @@
- assert: - assert:
that: that:
- result is failed - result is failed
when: connector.name.0 is search('pymysql') when: connector_name is search('pymysql')
- assert: - assert:
that: that:
- result is succeeded - 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 - name: attempt connection with newly created user ignoring hostname
mysql_info: mysql_info:

4
tests/integration/targets/test_mysql_query/tasks/issue-28.yml
View file

@ -54,12 +54,12 @@
- assert: - assert:
that: that:
- result is failed - result is failed
when: connector.name.0 is search('pymysql') when: connector_name is search('pymysql')
- assert: - assert:
that: that:
- result is succeeded - 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 - name: attempt connection with newly created user ignoring hostname
mysql_query: mysql_query:

4
tests/integration/targets/test_mysql_query/tasks/mysql_query_initial.yml
View file

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

4
tests/integration/targets/test_mysql_replication/tasks/issue-28.yml
View file

@ -55,12 +55,12 @@
- assert: - assert:
that: that:
- result is failed - result is failed
when: connector.name.0 is search('pymysql') when: connector_name is search('pymysql')
- assert: - assert:
that: that:
- result is succeeded - 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 - name: attempt connection with newly created user ignoring hostname
mysql_replication: mysql_replication:

20
tests/integration/targets/test_mysql_replication/tasks/mysql_replication_initial.yml
View file

@ -184,8 +184,8 @@
shell: "echo \"INSERT INTO {{ test_table }} (id) VALUES (1), (2), (3); FLUSH LOGS;\" | {{ mysql_command }} -P{{ mysql_primary_port }} {{ test_db }}" 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 - name: Small pause to be sure the bin log, which was flushed previously, reached the replica
pause: ansible.builtin.wait_for:
seconds: 2 timeout: 2
# Test primary log pos has been changed: # Test primary log pos has been changed:
- name: Get replica status - name: Get replica status
@ -218,10 +218,12 @@
fail_on_error: true fail_on_error: true
register: result register: result
# mysqlclient 2.0.1 always return "changed"
- assert: - assert:
that: that:
- result is not changed - result is not changed
when: (pymysql_version.stdout | default('1000', true)) is version('0.9.3', '<=') when:
- connector_name == 'pymysql'
# Test stopreplica mode: # Test stopreplica mode:
- name: Stop replica - name: Stop replica
@ -236,7 +238,12 @@
- result is changed - result is changed
- result.queries == ["STOP SLAVE"] or result.queries == ["STOP REPLICA"] - 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: # Test stopreplica mode:
# mysqlclient 2.0.1 always return "changed"
- name: Stop replica that is no longer running - name: Stop replica that is no longer running
mysql_replication: mysql_replication:
<<: *mysql_params <<: *mysql_params
@ -247,8 +254,9 @@
- assert: - assert:
that: that:
- result is not changed - result is not changed
when: (pymysql_version.stdout | default('1000', true)) is version('0.9.3', '<=') when:
- connector_name == 'pymysql'
# master / slave related choices were removed in 3.0.0 # master / slave related choices were removed in 3.0.0
# https://github.com/ansible-collections/community.mysql/pull/252 # https://github.com/ansible-collections/community.mysql/pull/252

2
tests/integration/targets/test_mysql_user/tasks/issue-121.yml
View file

@ -9,8 +9,6 @@
block: block:
# ============================================================ # ============================================================
- shell: pip show pymysql | awk '/Version/ {print $2}'
register: pymysql_version
- name: get server certificate - name: get server certificate
copy: copy:

4
tests/integration/targets/test_mysql_user/tasks/issue-28.yml
View file

@ -53,12 +53,12 @@
- assert: - assert:
that: that:
- result is failed - result is failed
when: connector.name.0 is search('pymysql') when: connector_name is search('pymysql')
- assert: - assert:
that: that:
- result is succeeded - 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 - name: attempt connection with newly created user ignoring hostname
mysql_user: mysql_user:

12
tests/integration/targets/test_mysql_user/tasks/test_user_plugin_auth.yml
View file

@ -356,12 +356,14 @@
# plugins that are loaded by default are sha2*, but these aren't compatible with pymysql < 0.9, so skip these tests # plugins that are loaded by default are sha2*, but these aren't compatible with pymysql < 0.9, so skip these tests
# for those versions. # for those versions.
# #
- name: Get pymysql version
shell: pip show pymysql | awk '/Version/ {print $2}'
register: pymysql_version
- name: Test plugin auth switching which doesn't work on pymysql < 0.9 - 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: block:
- name: Create user with plugin auth (empty auth string) - name: Create user with plugin auth (empty auth string)

2
tests/integration/targets/test_mysql_variables/tasks/assert_fail_msg.yml
View file

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

4
tests/integration/targets/test_mysql_variables/tasks/assert_var.yml
View file

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

4
tests/integration/targets/test_mysql_variables/tasks/assert_var_output.yml
View file

@ -22,7 +22,7 @@
- name: assert output message changed value - name: assert output message changed value
assert: assert:
that: that:
- "output.changed == {{ changed }}" - "output.changed | bool == changed | bool"
- set_fact: - set_fact:
key_name: "{{ var_name }}" key_name: "{{ var_name }}"
@ -35,6 +35,6 @@
- name: assert output variable info match mysql variable info - name: assert output variable info match mysql variable info
assert: assert:
that: that:
- "result.changed == true" - "result.changed | bool == true"
- "key_name in result.stdout" - "key_name in result.stdout"
- "key_value in result.stdout" - "key_value in result.stdout"

4
tests/integration/targets/test_mysql_variables/tasks/issue-28.yml
View file

@ -51,12 +51,12 @@
- assert: - assert:
that: that:
- result is failed - result is failed
when: connector.name.0 is search('pymysql') when: connector_name is search('pymysql')
- assert: - assert:
that: that:
- result is succeeded - 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 - name: attempt connection with newly created user ignoring hostname
mysql_variables: mysql_variables:

6
tests/integration/targets/test_mysql_variables/tasks/mysql_variables.yml
View file

@ -155,15 +155,15 @@
mysql_variables: mysql_variables:
<<: *mysql_params <<: *mysql_params
variable: max_connect_errors variable: max_connect_errors
value: -1 value: '-1'
register: oor_result register: oor_result
ignore_errors: true ignore_errors: true
- include: assert_var.yml changed=true output={{ oor_result }} var_name=max_connect_errors var_value=1 - 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' - 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) # Verify mysql_variable fails when setting an incorrect value (incorrect type)