From 7690798ae71ffafbafab0d8bd711d491b53ae5ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Sun, 14 May 2023 12:05:01 +0000 Subject: [PATCH] Deprecate admin-hash_passwords in TAP tests #4218 --- test/tap/tests/set_testing-240-t.cpp | 2 ++ test/tap/tests/test_cluster_sync-t.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/test/tap/tests/set_testing-240-t.cpp b/test/tap/tests/set_testing-240-t.cpp index db6e9b8297..d8cb64f7cb 100644 --- a/test/tap/tests/set_testing-240-t.cpp +++ b/test/tap/tests/set_testing-240-t.cpp @@ -464,10 +464,12 @@ int main(int argc, char *argv[]) { fprintf(stderr, "File %s, line %d, Error: %s\n", __FILE__, __LINE__, mysql_error(proxysql_admin)); return EXIT_FAILURE; } +/* admin-hash_passwords has been deprecated diag("Disabling admin-hash_passwords to be able to run test on MySQL 8"); MYSQL_QUERY(proxysql_admin, "SET admin-hash_passwords='false'"); MYSQL_QUERY(proxysql_admin, "LOAD ADMIN VARIABLES TO RUNTIME"); MYSQL_QUERY(proxysql_admin, "LOAD MYSQL USERS TO RUNTIME"); +*/ diag("Creating new hostgroup 101: DELETE FROM mysql_servers WHERE hostgroup_id = 101"); MYSQL_QUERY(proxysql_admin, "DELETE FROM mysql_servers WHERE hostgroup_id = 101"); diff --git a/test/tap/tests/test_cluster_sync-t.cpp b/test/tap/tests/test_cluster_sync-t.cpp index e5897061ec..6fc671fb4e 100644 --- a/test/tap/tests/test_cluster_sync-t.cpp +++ b/test/tap/tests/test_cluster_sync-t.cpp @@ -2159,7 +2159,7 @@ int main(int, char**) { // std::make_tuple("admin-cluster_username" , "" ), Known issue, can't clear // std::make_tuple("admin-cluster_password" , "" ), Known issue, can't clear // std::make_tuple("admin-debug" , "false" ), Should not be synced - std::make_tuple("admin-hash_passwords" , "true" ), +// std::make_tuple("admin-hash_passwords" , "true" ), // deprecated variable // std::make_tuple("admin-mysql_ifaces" , "0.0.0.0:6032" ), // disabled because of cluster_sync_interfaces=false std::make_tuple("admin-prometheus_memory_metrics_interval" , "61" ), std::make_tuple("admin-read_only" , "false" ),