From d0840e512e2ba74c10c4cad3f89a85a2bdcf44b4 Mon Sep 17 00:00:00 2001 From: Laurent Indermuehle Date: Wed, 24 Jul 2024 17:44:38 +0200 Subject: [PATCH] Revert file edited by mistake --- .../tasks/mariadb_replication_initial.yml | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/tests/integration/old_mariadb_replication/tasks/mariadb_replication_initial.yml b/tests/integration/old_mariadb_replication/tasks/mariadb_replication_initial.yml index e54cd0dc..f65d0902 100644 --- a/tests/integration/old_mariadb_replication/tasks/mariadb_replication_initial.yml +++ b/tests/integration/old_mariadb_replication/tasks/mariadb_replication_initial.yml @@ -46,23 +46,10 @@ master_log_pos: '{{ master_status.Position }}' register: result -- name: Assert that changemaster is changed and query matchs for MariaDB and MySQL < 8.0.23 - ansible.builtin.assert: - that: - - result is changed - - result.queries[0] is match("CHANGE MASTER ('\S+' )?TO MASTER_HOST='[0-9.]+',MASTER_USER='\w+',MASTER_PASSWORD='[*]{8}',MASTER_PORT=\d+,MASTER_LOG_FILE='mysql-bin.000001',MASTER_LOG_POS=\d+") - when: - - > - db_engine == 'mariadb' or - (db_engine == 'mysql' and db_version is version('8.0.23', '<')) - -- name: Assert that changemaster is changed and query matchs for MySQL >= 8.0.23 - ansible.builtin.assert: +- assert: that: - - result is changed - - result.queries[0] is match("CHANGE REPLICATION SOURCE ('\S+' )?TO MASTER_HOST='[0-9.]+',MASTER_USER='\w+',MASTER_PASSWORD='[*]{8}',MASTER_PORT=\d+,MASTER_LOG_FILE='mysql-bin.000001',MASTER_LOG_POS=\d+") - when: - - db_engine == 'mysql' and db_version is version('8.0.23', '>=') + - result is changed + - result.queries[0] is match("CHANGE MASTER ('\S+' )?TO MASTER_HOST='[0-9.]+',MASTER_USER='\w+',MASTER_PASSWORD='[*]{8}',MASTER_PORT=\d+,MASTER_LOG_FILE='mysql-bin.000001',MASTER_LOG_POS=\d+") # Test startslave mode: - name: Start slave