diff --git a/tests/integration/targets/test_mysql_db/tasks/config_overrides_defaults.yml b/tests/integration/targets/test_mysql_db/tasks/config_overrides_defaults.yml index d818eaa..d08429c 100644 --- a/tests/integration/targets/test_mysql_db/tasks/config_overrides_defaults.yml +++ b/tests/integration/targets/test_mysql_db/tasks/config_overrides_defaults.yml @@ -11,20 +11,27 @@ - name: Add fake port to config file shell: 'echo "port = {{ fake_port }}" >> {{ config_file }}' +- name: Get pymysql version for the next include + 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', '>=') - name: Create include_dir file: path: '{{ include_dir }}' state: directory mode: '0777' + when: (pymysql_version.stdout | default('1000', true)) 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', '>=') - name: Create database using fake port to connect to, must fail mysql_db: diff --git a/tests/integration/targets/test_mysql_db/tasks/main.yml b/tests/integration/targets/test_mysql_db/tasks/main.yml index ec0cfd6..139d5bb 100644 --- a/tests/integration/targets/test_mysql_db/tasks/main.yml +++ b/tests/integration/targets/test_mysql_db/tasks/main.yml @@ -320,11 +320,7 @@ - include: encoding_dump_import.yml file=latin1.sql format_msg_type=ASCII -- name: Get pymysql version for the next include - shell: pip show pymysql | awk '/Version/ {print $2}' - register: pymysql_version - - include: config_overrides_defaults.yml - when: ansible_python.version_info[0] >= 3 and (pymysql_version.stdout | default('1000', true)) is version('0.9.3', '>=') + when: ansible_python.version_info[0] >= 3 - include: issue-28.yml