diff --git a/tests/integration/targets/setup_controller/tasks/setvars.yml b/tests/integration/targets/setup_controller/tasks/setvars.yml index 27ba668..0ca39aa 100644 --- a/tests/integration/targets/setup_controller/tasks/setvars.yml +++ b/tests/integration/targets/setup_controller/tasks/setvars.yml @@ -32,7 +32,7 @@ - name: "{{ role_name }} | Setvars | Set Fact using above facts" ansible.builtin.set_fact: connector_name: "{{ connector_name_version.split('=')[0].strip() }}" - connector_ver: "{{ connector_name_version.split('=')[2].strip() }}" + connector_version: "{{ connector_name_version.split('=')[2].strip() }}" db_engine: "{{ db_engine_version.split(':')[0].strip() }}" db_version: "{{ db_engine_version.split(':')[1].strip() }}" python_version: "{{ python_version_lookup.strip() }}" @@ -55,7 +55,7 @@ vars: msg: |- connector_name: {{ connector_name }} - connector_ver: {{ connector_ver }} + connector_version: {{ connector_version }} db_engine: {{ db_engine }} db_version: {{ db_version }} python_version: {{ python_version }} diff --git a/tests/integration/targets/setup_controller/tasks/verify.yml b/tests/integration/targets/setup_controller/tasks/verify.yml index 09c2fac..7b14f1e 100644 --- a/tests/integration/targets/setup_controller/tasks/verify.yml +++ b/tests/integration/targets/setup_controller/tasks/verify.yml @@ -27,7 +27,7 @@ assert: that: - primary_info.connector.name == connector_name - - primary_info.connector.version == connector_ver + - primary_info.connector.version == connector_version when: - connector_name == 'pymysql' @@ -35,7 +35,7 @@ assert: that: - primary_info.connector.name == 'MySQLdb' - - primary_info.connector.version == connector_ver + - primary_info.connector.version == connector_version when: - connector_name == 'mysqlclient' 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 cb34537..390c6ae 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 @@ -20,7 +20,7 @@ connector_name != 'pymysql' or ( connector_name == 'pymysql' - and connector_ver is version('0.9.3', '>=') + and connector_version is version('0.9.3', '>=') ) - name: Config overrides | Create include_dir @@ -33,7 +33,7 @@ connector_name != 'pymysql' or ( connector_name == 'pymysql' - and connector_ver is version('0.9.3', '>=') + and connector_version is version('0.9.3', '>=') ) - name: Config overrides | Add include_dir @@ -46,7 +46,7 @@ connector_name != 'pymysql' or ( connector_name == 'pymysql' - and connector_ver is version('0.9.3', '>=') + and connector_version is version('0.9.3', '>=') ) - name: Config overrides | Create database using fake port to connect to, must fail diff --git a/tests/integration/targets/test_mysql_query/tasks/mysql_query_initial.yml b/tests/integration/targets/test_mysql_query/tasks/mysql_query_initial.yml index fa42117..08a16ab 100644 --- a/tests/integration/targets/test_mysql_query/tasks/mysql_query_initial.yml +++ b/tests/integration/targets/test_mysql_query/tasks/mysql_query_initial.yml @@ -372,7 +372,7 @@ or ( db_engine == 'mysql' and connector_name == 'mysqlclient' - and connector_ver is version('2.0.1', '>') + and connector_version is version('2.0.1', '>') ) # Issue https://github.com/ansible-collections/community.mysql/issues/268 @@ -386,7 +386,7 @@ - result is changed when: - connector_name == 'mysqlclient' - - connector_ver is version('2.0.1', '==') + - connector_version is version('2.0.1', '==') - db_engine == 'mysql' - name: Drop db {{ test_db }} diff --git a/tests/integration/targets/test_mysql_user/tasks/test_user_plugin_auth.yml b/tests/integration/targets/test_mysql_user/tasks/test_user_plugin_auth.yml index c70cea5..ac8ffb1 100644 --- a/tests/integration/targets/test_mysql_user/tasks/test_user_plugin_auth.yml +++ b/tests/integration/targets/test_mysql_user/tasks/test_user_plugin_auth.yml @@ -373,7 +373,7 @@ connector_name != 'pymysql' or ( connector_name == 'pymysql' - and connector_ver is version('0.9', '>=') + and connector_version is version('0.9', '>=') ) block: