From 932e074649d84d04fa4482f6bb0ef4a22a64a619 Mon Sep 17 00:00:00 2001 From: Rene Cannao Date: Sat, 21 Feb 2026 12:50:19 +0000 Subject: [PATCH] Fix reg_test_3847_admin_lock-t by using correct admin credentials and adding diagnostics --- test/tap/tests/reg_test_3847_admin_lock-t.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/tap/tests/reg_test_3847_admin_lock-t.cpp b/test/tap/tests/reg_test_3847_admin_lock-t.cpp index e110a7874..b82d4448b 100644 --- a/test/tap/tests/reg_test_3847_admin_lock-t.cpp +++ b/test/tap/tests/reg_test_3847_admin_lock-t.cpp @@ -73,7 +73,7 @@ int main(int argc, char** argv) { int w_res = wexecvp(proxysql_path, proxy_args, wexecvp_opts, s_stdout, s_stderr); if (w_res != EXIT_SUCCESS) { - diag("'wexecvp' failed with error: %d", w_res); + diag("'wexecvp' failed with error: %d (ETIME=62 is expected if timeout reached while ProxySQL is still running in foreground)", w_res); } err_code = w_res; @@ -88,12 +88,13 @@ int main(int argc, char** argv) { }, std::ref(launch_res)); // Check that the second ProxySQL is up and responsive - conn_opts_t conn_opts { "127.0.0.1", "radmin", "radmin", 26081 }; + diag("Waiting for ProxySQL replica to be ready on 127.0.0.1:26081 as %s:%s", cl.admin_username, cl.admin_password); + conn_opts_t conn_opts { "127.0.0.1", cl.admin_username, cl.admin_password, 26081 }; // Wait at max the child process timeout plus 5 seconds MYSQL* s_proxy_admin = wait_for_proxysql(conn_opts, 25); if (s_proxy_admin == nullptr) { - fprintf(stderr, "Error: %s\n", "Waiting for ProxySQL replica timedout"); + fprintf(stderr, "Error: %s (attempted with user %s:%s)\n", "Waiting for ProxySQL replica timedout", cl.admin_username, cl.admin_password); launch_sec_proxy.detach(); return EXIT_FAILURE; }