From 16f070f3186c3c22aaccd3c4fdc14b67062080f3 Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Fri, 15 Nov 2019 17:03:59 -0500 Subject: [PATCH] Fix mariadb_replication tests for CentOS 8 (#64865) --- .../tasks/mariadb_replication_connection_name.yml | 2 +- .../mariadb_replication/tasks/mariadb_replication_initial.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/targets/mariadb_replication/tasks/mariadb_replication_connection_name.yml b/test/integration/targets/mariadb_replication/tasks/mariadb_replication_connection_name.yml index ee99da05e05..577a029697a 100644 --- a/test/integration/targets/mariadb_replication/tasks/mariadb_replication_connection_name.yml +++ b/test/integration/targets/mariadb_replication/tasks/mariadb_replication_connection_name.yml @@ -40,7 +40,7 @@ - assert: that: - result is changed - - result.queries == ["CHANGE MASTER '{{ conn_name }}' TO MASTER_HOST='127.0.0.1',MASTER_USER='replication_user',MASTER_PASSWORD='********',MASTER_PORT=3306,MASTER_LOG_FILE='mysql-bin.000001',MASTER_LOG_POS=765"] + - 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 with connection_name diff --git a/test/integration/targets/mariadb_replication/tasks/mariadb_replication_initial.yml b/test/integration/targets/mariadb_replication/tasks/mariadb_replication_initial.yml index 9420ae2e413..5c77e6465a5 100644 --- a/test/integration/targets/mariadb_replication/tasks/mariadb_replication_initial.yml +++ b/test/integration/targets/mariadb_replication/tasks/mariadb_replication_initial.yml @@ -49,7 +49,7 @@ - assert: that: - result is changed - - result.queries == ["CHANGE MASTER TO MASTER_HOST='127.0.0.1',MASTER_USER='replication_user',MASTER_PASSWORD='********',MASTER_PORT=3306,MASTER_LOG_FILE='mysql-bin.000001',MASTER_LOG_POS=765"] + - 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