From 38838d7647c98817dc0ae8bcee6f5a5b71a31c54 Mon Sep 17 00:00:00 2001 From: Thomas Markwalder Date: Wed, 22 May 2024 07:34:26 -0400 Subject: [PATCH] [#3396] Addressed review comment mysql_tests.sh.in - cleaned up upgrade test functions --- src/bin/admin/tests/mysql_tests.sh.in | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in index 15b282e43f..7ab424bc95 100644 --- 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 -- 2.47.2