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

[master] Merge branch 'trac1846'

Browse Source
This commit is contained in:
JINMEI Tatuya
2012-03-27 19:22:30 -07:00
parent 9e5da4f420 73a6349b16
commit 8ab7817d7c
2 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/bin/dbutil/dbutil.py.in
View File

@@ -378,7 +378,10 @@ def get_latest_version():
This is the 'to' version held in the last element of the upgrades list This is the 'to' version held in the last element of the upgrades list
""" """
return UPGRADES[-1]['to'] # Temporarily hardcoded to return 1 as the schema version, until
# #324 is merged.
#return UPGRADES[-1]['to']
return (1, 0)
def get_version(db): def get_version(db):

58
src/bin/dbutil/tests/dbutil_test.sh.in
View File

@@ -359,19 +359,22 @@ check_version $testdata/old_v1.sqlite3 "V1.0"
check_no_backup $tempfile $backupfile check_no_backup $tempfile $backupfile
rm -f $tempfile $backupfile rm -f $tempfile $backupfile
echo "5.2. Database is an old V1 database - upgrade" # Temporarily disabled until #324 is merged
upgrade_ok_test $testdata/old_v1.sqlite3 $backupfile #echo "5.2. Database is an old V1 database - upgrade"
rm -f $tempfile $backupfile #upgrade_ok_test $testdata/old_v1.sqlite3 $backupfile
#rm -f $tempfile $backupfile
echo "6.1. Database is new V1 database - check" # Temporarily disabled until #324 is merged
check_version $testdata/new_v1.sqlite3 "V1.0" #echo "6.1. Database is new V1 database - check"
check_no_backup $tempfile $backupfile #check_version $testdata/new_v1.sqlite3 "V1.0"
rm -f $tempfile $backupfile #check_no_backup $tempfile $backupfile
#rm -f $tempfile $backupfile
echo "6.2. Database is a new V1 database - upgrade" # Temporarily disabled until #324 is merged
upgrade_ok_test $testdata/new_v1.sqlite3 $backupfile #echo "6.2. Database is a new V1 database - upgrade"
rm -f $tempfile $backupfile #upgrade_ok_test $testdata/new_v1.sqlite3 $backupfile
#rm -f $tempfile $backupfile
echo "7.1. Database is V2.0 database - check" echo "7.1. Database is V2.0 database - check"
@@ -402,9 +405,10 @@ upgrade_fail_test $testdata/too_many_version.sqlite3 $backupfile
rm -f $tempfile $backupfile rm -f $tempfile $backupfile
echo "10.0. Upgrade corrupt database" # Temporarily disabled until #324 is merged
upgrade_fail_test $testdata/corrupt.sqlite3 $backupfile #echo "10.0. Upgrade corrupt database"
rm -f $tempfile $backupfile #upgrade_fail_test $testdata/corrupt.sqlite3 $backupfile
#rm -f $tempfile $backupfile
echo "11. Record count test" echo "11. Record count test"
@@ -443,20 +447,15 @@ copy_file $testdata/old_v1.sqlite3 $tempfile
passzero $? passzero $?
rm -f $tempfile $backupfile rm -f $tempfile $backupfile
echo "13.3 quiet flag" # Temporarily disabled until #324 is merged
copy_file $testdata/old_v1.sqlite3 $tempfile #echo "13.3 Interactive prompt - yes"
../run_dbutil.sh --check --quiet $tempfile 2>&1 | grep . #copy_file $testdata/old_v1.sqlite3 $tempfile
failzero $? #../run_dbutil.sh --upgrade $tempfile << .
rm -f $tempfile $backupfile #Yes
#.
echo "13.3 Interactive prompt - yes" #passzero $?
copy_file $testdata/old_v1.sqlite3 $tempfile #check_version $tempfile "V2.0"
../run_dbutil.sh --upgrade $tempfile << . #rm -f $tempfile $backupfile
Yes
.
passzero $?
check_version $tempfile "V2.0"
rm -f $tempfile $backupfile
echo "13.4 Interactive prompt - no" echo "13.4 Interactive prompt - no"
copy_file $testdata/old_v1.sqlite3 $tempfile copy_file $testdata/old_v1.sqlite3 $tempfile
@@ -468,6 +467,11 @@ diff $testdata/old_v1.sqlite3 $tempfile > /dev/null
passzero $? passzero $?
rm -f $tempfile $backupfile rm -f $tempfile $backupfile
echo "13.5 quiet flag"
copy_file $testdata/old_v1.sqlite3 $tempfile
../run_dbutil.sh --check --quiet $tempfile 2>&1 | grep .
failzero $?
rm -f $tempfile $backupfile
# Report the result # Report the result
if [ $failcount -eq 0 ]; then if [ $failcount -eq 0 ]; then