[#3396] Addressed review comment

mysql_tests.sh.in - cleaned up upgrade test functions

diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index 15b282e43fad1e52ff6b8bf26e360c41660d0c15..7ab424bc95ae67a51527fed2704b95b661174b5c 100644 (file)
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -813,13 +813,7 @@ mysql_upgrade_18_to_19_test() {
     run_statement "ipv6_reservations_insert" "$qry" "3001::99"
 }
 
-mysql_upgrade_19_to_21_test() {
-    # For now this function only verifies version number.
-    version=$("${kea_admin}" db-version mysql -u "${db_user}" -p "${db_password}" -n "${db_name}" -d "${db_scripts_dir}")
-    assert_str_eq "21.0" "${version}" "Expected kea-admin to return %s, returned value was %s"
-}
-
-mysql_upgrade_21_to_22_test() {
+mysql_upgrade_19_to_22_test() {
     # For now this function only verifies version number.
     version=$("${kea_admin}" db-version mysql -u "${db_user}" -p "${db_password}" -n "${db_name}" -d "${db_scripts_dir}")
     assert_str_eq "22.0" "${version}" "Expected kea-admin to return %s, returned value was %s"
@@ -1509,11 +1503,8 @@ SET @disable_audit = 0"
     # Check upgrade from 18.0 to 19.0.
     mysql_upgrade_18_to_19_test
 
-    # Check upgrade from 19.0 to 21.0.
-    # mysql_upgrade_19_to_21_test - only checks version
-
-    # Check upgrade from 21.0 to 22.0.
-    mysql_upgrade_21_to_22_test
+    # Check upgrade from 19.0 to 22.0.
+    mysql_upgrade_19_to_22_test
 
     # Let's wipe the whole database
     mysql_wipe