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

[PR #416/97318559 backport][stable-1] Fix ci python requirements (#418)

Browse source 
* :Fix ci python requirements (#416)

* Add matrix for python and ansible-core versions for sanity tests

* Add python 3.9 to integrations tests

* Add python 3.9 to unit tests

* Reformat sort by python version first

(cherry picked from commit 97318559e5)

* Fix string to int comparison error 1292

* Fix assert expected changed value

* Cut assertion that is incorrect

With both connectors, and only in stable-1 apparently, the test is
always failed.

* Fix bool comparison

* Revert separated tests for both connectors

* Refactor test using connector.name variable

* Refactor filtering of tasks using connector's vars sets during setup

* Fix "command not found" and "database doesn't exists"

* Fix assertion by not running on failing connectors

* Fix missing package when using sha256_password with MySQL 8
This commit is contained in:
Laurent Indermühle 2022-08-12 16:51:40 +02:00 • committed by GitHub
parent 41e7ce5aaa
commit 836a1ce048
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 99 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
.github/workflows/ansible-test-plugins.yml vendored
View file

@ -29,6 +29,18 @@ jobs:
- stable-2.12
- stable-2.13
- devel
python:
- 3.8
- 3.9
exclude:
- python: 3.8
ansible: stable-2.13
- python: 3.8
ansible: devel
- python: 3.9
ansible: stable-2.11
- python: 3.9
ansible: stable-2.12
steps:
- name: Check out code
@ -39,7 +51,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: ${{ matrix.python }}
- name: Install ansible-base (${{ matrix.ansible }})
run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
@ -64,6 +76,8 @@ jobs:
- devel
python:
- 3.6
- 3.8
- 3.9
connector:
- pymysql==0.7.10
- pymysql==0.9.3
@ -71,14 +85,22 @@ jobs:
exclude:
- mysql: 8.0.22
connector: pymysql==0.7.10
- python: 3.8
ansible: stable-2.11
- python: 3.6
ansible: stable-2.12
- python: 3.6
ansible: stable-2.13
- python: 3.6
ansible: devel
- python: 3.8
ansible: stable-2.11
- python: 3.8
ansible: stable-2.13
- python: 3.8
ansible: devel
- python: 3.9
ansible: stable-2.11
- python: 3.9
ansible: stable-2.12
steps:
- name: Check out code
@ -89,7 +111,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: ${{ matrix.python }}
- name: Install ansible-base (${{ matrix.ansible }})
run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
@ -125,6 +147,18 @@ jobs:
- stable-2.12
- stable-2.13
- devel
python:
- 3.8
- 3.9
exclude:
- python: 3.8
ansible: stable-2.13
- python: 3.8
ansible: devel
- python: 3.9
ansible: stable-2.11
- python: 3.9
ansible: stable-2.12
steps:
- name: Check out code
@ -135,7 +169,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: ${{ matrix.python }}
- name: Install ansible-base (${{matrix.ansible}})
run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check

1
tests/integration/targets/setup_mysql/vars/main.yml
View file

@ -23,6 +23,7 @@ install_prereqs:
install_python_prereqs:
- python3-dev
- python3-cryptography
- default-libmysqlclient-dev
- build-essential

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

@ -11,27 +11,40 @@
- name: Add fake port to config file
shell: 'echo "port = {{ fake_port }}" >> {{ config_file }}'
- name: Get pymysql version
shell: pip show pymysql | awk '/Version/ {print $2}'
register: pymysql_version
- name: Add blank line
shell: 'echo "" >> {{ config_file }}'
when: (pymysql_version.stdout | default('1000', true)) is version('0.9.3', '>=')
when:
- >
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:
path: '{{ include_dir }}'
state: directory
mode: '0777'
when: (pymysql_version.stdout | default('1000', true)) is version('0.9.3', '>=')
when:
- >
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:
path: '{{ config_file }}'
line: '!includedir {{ include_dir }}'
insertafter: EOF
when: (pymysql_version.stdout | default('1000', true)) is version('0.9.3', '>=')
when:
- >
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:

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

@ -9,8 +9,6 @@
block:
# ============================================================
- shell: pip show pymysql | awk '/Version/ {print $2}'
register: pymysql_version
- name: get server certificate
copy:
@ -49,12 +47,12 @@
- assert:
that:
- result is failed
when: pymysql_version.stdout != ""
when: connector_name is search('pymysql')
- assert:
that:
- result is succeeded
when: pymysql_version.stdout == ""
when: connector_name is not search('pymysql')
- name: attempt connection with newly created user ignoring hostname
mysql_db:

4
tests/integration/targets/test_mysql_db/tasks/main.yml
View file

@ -28,8 +28,8 @@
- name: remove database if it exists
command: >
"{{ mysql_command }} -sse 'drop database {{ db_name }}'"
ignore_errors: True
{{ mysql_command }} -sse 'drop database if exists {{ db_name }}'
ignore_errors: true
- name: make sure the test database is not there
command: "{{ mysql_command }} {{ db_name }}"

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

@ -9,8 +9,6 @@
block:
# ============================================================
- shell: pip show pymysql | awk '/Version/ {print $2}'
register: pymysql_version
- name: get server certificate
copy:
@ -47,12 +45,12 @@
- assert:
that:
- result is failed
when: pymysql_version.stdout != ""
when: connector_name is search('pymysql')
- assert:
that:
- result is succeeded
when: pymysql_version.stdout == ""
when: connector_name is not search('pymysql')
- name: attempt connection with newly created user ignoring hostname
mysql_info:

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

@ -9,8 +9,6 @@
block:
# ============================================================
- shell: pip show pymysql | awk '/Version/ {print $2}'
register: pymysql_version
- name: get server certificate
copy:
@ -47,12 +45,12 @@
- assert:
that:
- result is failed
when: pymysql_version.stdout != ""
when: connector_name is search('pymysql')
- assert:
that:
- result is succeeded
when: pymysql_version.stdout == ""
when: connector_name is not search('pymysql')
- name: attempt connection with newly created user ignoring hostname
mysql_query:

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

@ -9,8 +9,6 @@
block:
# ============================================================
- shell: pip show pymysql | awk '/Version/ {print $2}'
register: pymysql_version
- name: get server certificate
copy:
@ -48,12 +46,12 @@
- assert:
that:
- result is failed
when: pymysql_version.stdout != ""
when: connector_name is search('pymysql')
- assert:
that:
- result is succeeded
when: pymysql_version.stdout == ""
when: connector_name is not search('pymysql')
- name: attempt connection with newly created user ignoring hostname
mysql_replication:

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

@ -199,9 +199,6 @@
- replica_status.Exec_Source_Log_Pos != mysql_primary_status.Position
when: mysql8022_and_higher == true
- shell: pip show pymysql | awk '/Version/ {print $2}'
register: pymysql_version
- name: Start replica that is already running
mysql_replication:
<<: *mysql_params
@ -210,10 +207,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
when: (pymysql_version.stdout | default('1000', true)) is version('0.9.3', '<=')
- result is not changed
when:
- connector_name is search('pymysql')
- connector_ver is version('0.9.3', '<=')
# Test stopreplica mode:
- name: Stop replica using deprecated stopslave choice
@ -237,7 +237,10 @@
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: (pymysql_version.stdout | default('1000', true)) is version('0.9.3', '<=')
- result is not changed
when:
- connector_name is search('pymysql')
- connector_ver is version('0.9.3', '<=')

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

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

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

@ -9,8 +9,6 @@
block:
# ============================================================
- shell: pip show pymysql | awk '/Version/ {print $2}'
register: pymysql_version
- name: get server certificate
copy:
@ -50,12 +48,12 @@
- assert:
that:
- result is failed
when: pymysql_version.stdout != ""
when: connector_name is search('pymysql')
- assert:
that:
- result is succeeded
when: pymysql_version.stdout == ""
when: connector_name is not search('pymysql')
- name: attempt connection with newly created user ignoring hostname
mysql_user:

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

@ -334,12 +334,15 @@
# 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: 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
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)

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)
assert:
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
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"

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

@ -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 }}"

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

@ -9,8 +9,6 @@
block:
# ============================================================
- shell: pip show pymysql | awk '/Version/ {print $2}'
register: pymysql_version
- name: get server certificate
copy:
@ -48,12 +46,12 @@
- assert:
that:
- result is failed
when: pymysql_version.stdout != ""
when: connector.name.0 is search('pymysql')
- assert:
that:
- result is succeeded
when: pymysql_version.stdout == ""
when: connector.name.0 is not search('pymysql')
- name: attempt connection with newly created user ignoring hostname
mysql_variables:

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

@ -151,22 +151,20 @@
# ============================================================
# Verify mysql_variable fails when setting an incorrect value (out of range)
#
- shell: pip show pymysql | awk '/Version/ {print $2}'
register: pymysql_version
- name: set mysql variable value to a number out of range
mysql_variables:
<<: *mysql_params
variable: max_connect_errors
value: -1
value: '-1'
register: oor_result
ignore_errors: true
- include: assert_var.yml changed=true output={{ oor_result }} var_name=max_connect_errors var_value=1
when: pymysql_version.stdout == ""
when: connector.name.0 is not search('pymysql')
- include: assert_fail_msg.yml output={{ oor_result }} msg='Truncated incorrect'
when: pymysql_version.stdout != ""
when: connector.name.0 is search('pymysql')
# ============================================================
# Verify mysql_variable fails when setting an incorrect value (incorrect type)