From: Marcin Siodelski <marcin@isc.org>
Date: Tue, 30 Aug 2016 13:56:31 +0000 (+0200)
Subject: [master] Fixed failures of the MySQL database upgrade test.
X-Git-Tag: trac5004_base~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a54210ac4d45a3cf57ad025a9f85b1d714dabe3f;p=thirdparty%2Fkea.git

[master] Fixed failures of the MySQL database upgrade test.

This change was okayed on jabber.
---

diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index ecab9a73a5..78e86aa23e 100644
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -305,10 +305,10 @@ EOF
     # verify that foreign key fk_host_identifier_type exists
     qry="show create table hosts";
     text=`mysql_execute "${qry}"`
-    count=`echo $text | grep -ic "fk_host_identifier_type"`
+    count=`echo $text | grep -ic -m 1 "fk_host_identifier_type"`
     ERRCODE=$?
     assert_eq 0 $ERRCODE "show create table hosts failed. (expected status code %d, returned %d)"
-    assert_eq 2 "$count" "show create table hosts did not return correct number of fk_host_identifier_type instances. (expected %d, returned %d)"
+    assert_eq 1 "$count" "show create table hosts did not return correct number of fk_host_identifier_type instances. (expected %d, returned %d)"
 
     # verify that dhcp_option_scope table exists.
     qry="select count(*) from dhcp_option_scope";