mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 21:45:37 +00:00
Code Issues Releases Wiki Activity

[#1405] fixed unittests

Browse Source
This commit is contained in:
Razvan Becheriu
2020-10-13 17:40:53 +03:00
parent f90a40f037
commit c8f9a95bc3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/admin/tests/mysql_tests.sh.in
View File

@@ -264,7 +264,7 @@ mysql_upgrade_test() {
assert_str_eq "1.0" ${version} "Expected kea-admin to return %s, returned value was %s" assert_str_eq "1.0" ${version} "Expected kea-admin to return %s, returned value was %s"
# Ok, we have a 1.0 database. Let's upgrade it to 9.4 # Ok, we have a 1.0 database. Let's upgrade it to 9.5
${keaadmin} db-upgrade mysql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir ${keaadmin} db-upgrade mysql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir
ERRCODE=$? ERRCODE=$?
@@ -766,9 +766,9 @@ insert into hosts(dhcp_identifier, dhcp_identifier_type, dhcp4_subnet_id, ipv4_a
ERRCODE=$? ERRCODE=$?
assert_eq 0 $ERRCODE "insert into hosts failed, expected exit code %d, actual %d" assert_eq 0 $ERRCODE "insert into hosts failed, expected exit code %d, actual %d"
# Verify upgraded schema reports version 9.4 # Verify upgraded schema reports version 9.5
version=$(${keaadmin} db-version mysql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir) version=$(${keaadmin} db-version mysql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir)
assert_str_eq "9.4" ${version} "Expected kea-admin to return %s, returned value was %s" assert_str_eq "9.5" ${version} "Expected kea-admin to return %s, returned value was %s"
# Let's wipe the whole database # Let's wipe the whole database
mysql_wipe mysql_wipe

2
src/lib/mysql/mysql_constants.h
View File

@@ -53,7 +53,7 @@ const int MLM_MYSQL_FETCH_FAILURE = 0;
/// @name Current database schema version values. /// @name Current database schema version values.
//@{ //@{
const uint32_t MYSQL_SCHEMA_VERSION_MAJOR = 9; const uint32_t MYSQL_SCHEMA_VERSION_MAJOR = 9;
const uint32_t MYSQL_SCHEMA_VERSION_MINOR = 4; const uint32_t MYSQL_SCHEMA_VERSION_MINOR = 5;
//@} //@}