[#1387] Fixed admin tests

diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index 368555e940c5ae994911b42488afa9447fb3ef8f..648fddfc8eaf22b4aa44b92975118481dc357128 100644 (file)
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -864,7 +864,7 @@ mysql_upgrade_test() {
 
     # Verify that the upgraded schema reports the latest version.
     version=$("${kea_admin}" db-version mysql -u "${db_user}" -p "${db_password}" -n "${db_name}" -d "${db_scripts_dir}")
-    assert_str_eq "24.0" "${version}" "Expected kea-admin to return %s, returned value was %s"
+    assert_str_eq "25.0" "${version}" "Expected kea-admin to return %s, returned value was %s"
 
     # Let's check that the new tables are indeed there.
 
@@ -3375,8 +3375,8 @@ mysql_migrate_opt_record_type() {
     qry="select count(*) from dhcp6_option_def;"
     run_statement "#get 6_option_def_count before update" "$qry" 3
 
-    # Upgrade to schema 24.0
-    mysql_upgrade_schema_to_version 24.0
+    # Upgrade to schema 25.0
+    mysql_upgrade_schema_to_version 25.0
 
     # Verify the migrated records.
     qry="select type from dhcp4_option_def where name = 'foo';"
@@ -3438,8 +3438,8 @@ mysql_remove_control_socket_parameters_test() {
     qry="select count(*) from dhcp6_global_parameter where name like '%control-socket%';"
     run_statement "#get 6_global parameter count before update" "$qry" 2
 
-    # Upgrade to schema 24.0
-    mysql_upgrade_schema_to_version 24.0
+    # Upgrade to schema 25.0
+    mysql_upgrade_schema_to_version 25.0
 
     # Verify the record have been removed.
     qry="select count(*) from dhcp4_global_parameter where name like '%control-socket%';"

diff --git a/src/bin/admin/tests/pgsql_tests.sh.in b/src/bin/admin/tests/pgsql_tests.sh.in
index e68c65128a86e3fc9e521120014eeabda2cdb0a8..28fc8bd2030171a289ccba0dcf7f4d0af21a44ef 100644 (file)
--- a/src/bin/admin/tests/pgsql_tests.sh.in
+++ b/src/bin/admin/tests/pgsql_tests.sh.in
@@ -142,7 +142,7 @@ pgsql_db_version_test() {
     run_command \
         "${kea_admin}" db-version pgsql -u "${db_user}" -p "${db_password}" -n "${db_name}"
     version="${OUTPUT}"
-    assert_str_eq "24.0" "${version}" "Expected kea-admin to return %s, returned value was %s"
+    assert_str_eq "25.0" "${version}" "Expected kea-admin to return %s, returned value was %s"
 
     # Let's wipe the whole database
     pgsql_wipe
@@ -954,7 +954,7 @@ pgsql_upgrade_test() {
 
     # Verify upgraded schema reports the latest version.
     version=$("${kea_admin}" db-version pgsql -u "${db_user}" -p "${db_password}" -n "${db_name}" -d "${db_scripts_dir}")
-    assert_str_eq "24.0" "${version}" 'Expected kea-admin to return %s, returned value was %s'
+    assert_str_eq "25.0" "${version}" 'Expected kea-admin to return %s, returned value was %s'
 
     # Check 1.0 to 2.0 upgrade
     pgsql_upgrade_1_0_to_2_0_test