From: Francis Dupont <fdupont@isc.org>
Date: Mon, 3 Aug 2020 09:17:50 +0000 (+0200)
Subject: [#1319] Fixed version mess
X-Git-Tag: Kea-1.8.0~147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=513573810b7dceb29cc319f72b641076f2c7ce0b;p=thirdparty%2Fkea.git

[#1319] Fixed version mess
---

diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index e325f166c0..1c4f6388c6 100644
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -1285,12 +1285,12 @@ mysql_unused_subnet_id_test() {
 
     run_statement "insert options" "$qry"
 
-    # Ok, we have a 4.0 database with hosts and options. Let's upgrade it to 5.0
-    ${keaadmin} db-upgrade mysql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir
-    ERRCODE=$?
+    # Ok, we have a 6.0 database with hosts and options. Let's upgrade it to 7.0
+    mysql_upgrade_schema_to_version 7.0
 
-    # Upgrade should succeed
-    assert_eq 0 $ERRCODE "upgrade failed"
+    # Version should be new 7.0
+    version=$(${keaadmin} db-version mysql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir)
+    assert_str_eq "7.0" ${version} "Expected kea-admin to return %s, returned value was %s"
 
     # Two hosts should have null v4 subnet ids
     qry="select count(host_id) from hosts where dhcp4_subnet_id is null;"