From 4e980fd3ba9ee99b9e10f33ddea4d17be4621b9a Mon Sep 17 00:00:00 2001 From: Enbiya Date: Tue, 1 Jul 2025 01:15:00 +0300 Subject: [PATCH] Fix MySQL test to support both MySQL and MariaDB clients --- .../e2e/tests/base/target_tcp_connect_mysql_test.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/testing/internal/e2e/tests/base/target_tcp_connect_mysql_test.go b/testing/internal/e2e/tests/base/target_tcp_connect_mysql_test.go index f6331807cd..64648a4e1b 100644 --- a/testing/internal/e2e/tests/base/target_tcp_connect_mysql_test.go +++ b/testing/internal/e2e/tests/base/target_tcp_connect_mysql_test.go @@ -117,7 +117,14 @@ func TestCliTcpTargetConnectMysql(t *testing.T) { var buf bytes.Buffer _, _ = io.Copy(&buf, f) - require.Contains(t, buf.String(), "mysql>", "Session did not return expected MySQL prompt") - require.Contains(t, buf.String(), mysqlDbName, "Session did not return expected output") + + output := buf.String() + t.Logf("MySQL session output: %s", output) + + require.Contains(t, output, "| "+mysqlDbName+" |", "Session did not return expected database query result") + + require.True(t, + strings.Contains(output, "mysql>") || strings.Contains(output, "MySQL ["), + "Session did not show MySQL/MariaDB prompt") t.Log("Successfully connected to MySQL target") }