From: Andrei Pavel <andrei@isc.org>
Date: Tue, 25 Jan 2022 13:51:55 +0000 (+0200)
Subject: [#2225] fix mysql test not matching reference text
X-Git-Tag: Kea-2.1.2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b77e32a3b993b065cd07d61a5cc2bc3c0504367;p=thirdparty%2Fkea.git

[#2225] fix mysql test not matching reference text
---

diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index 95610ccfbe..1d288774cd 100644
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -191,7 +191,10 @@ INSERT INTO schema_version VALUES (1, 7);'
         "${kea_admin}" db-version mysql -u "${db_user}" -p "${db_password}" -n "${db_name}" \
         -x --protocol=TCP -x --hello 2> "@abs_top_srcdir@/src/bin/admin/test-data"
     assert_eq 2 "${EXIT_CODE}" "kea-admin -x -x succeeded. (expected %d, exit code %d)"
-    assert_str_eq "mysql: unknown option '--hello'" "$(tail -n 1 "@abs_top_srcdir@/src/bin/admin/test-data")"
+    if ! grep -F "unknown option '--hello'" "@abs_top_srcdir@/src/bin/admin/test-data"; then
+        printf 'second parameter --hello was not passed to mysql with -x\n'
+        test_finish 1
+    fi
     rm -f "@abs_top_srcdir@/src/bin/admin/test-data"
 
     # Let's wipe the whole database