Skip to content

Commit 38838d7

Browse files
committed
[#3396] Addressed review comment
mysql_tests.sh.in - cleaned up upgrade test functions
1 parent 5753d7c commit 38838d7

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

src/bin/admin/tests/mysql_tests.sh.in

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -813,13 +813,7 @@ mysql_upgrade_18_to_19_test() {
813813
run_statement "ipv6_reservations_insert" "$qry" "3001::99"
814814
}
815815

816-
mysql_upgrade_19_to_21_test() {
817-
# For now this function only verifies version number.
818-
version=$("${kea_admin}" db-version mysql -u "${db_user}" -p "${db_password}" -n "${db_name}" -d "${db_scripts_dir}")
819-
assert_str_eq "21.0" "${version}" "Expected kea-admin to return %s, returned value was %s"
820-
}
821-
822-
mysql_upgrade_21_to_22_test() {
816+
mysql_upgrade_19_to_22_test() {
823817
# For now this function only verifies version number.
824818
version=$("${kea_admin}" db-version mysql -u "${db_user}" -p "${db_password}" -n "${db_name}" -d "${db_scripts_dir}")
825819
assert_str_eq "22.0" "${version}" "Expected kea-admin to return %s, returned value was %s"
@@ -1509,11 +1503,8 @@ SET @disable_audit = 0"
15091503
# Check upgrade from 18.0 to 19.0.
15101504
mysql_upgrade_18_to_19_test
15111505

1512-
# Check upgrade from 19.0 to 21.0.
1513-
# mysql_upgrade_19_to_21_test - only checks version
1514-
1515-
# Check upgrade from 21.0 to 22.0.
1516-
mysql_upgrade_21_to_22_test
1506+
# Check upgrade from 19.0 to 22.0.
1507+
mysql_upgrade_19_to_22_test
15171508

15181509
# Let's wipe the whole database
15191510
mysql_wipe

0 commit comments

Comments
 (0)