Commit 01d11e9f authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

[324] re-increased the assumed latest version dbutil (to 2.0).

test cases that rely on the latest version and were temporarily disabled
were now re-enabled.
parent a3ccc5c6
......@@ -378,10 +378,7 @@ def get_latest_version():
This is the 'to' version held in the last element of the upgrades list
"""
# Temporarily hardcoded to return 1 as the schema version, until
# #324 is merged.
#return UPGRADES[-1]['to']
return (1, 0)
return UPGRADES[-1]['to']
def get_version(db):
......
......@@ -359,22 +359,19 @@ check_version $testdata/old_v1.sqlite3 "V1.0"
check_no_backup $tempfile $backupfile
rm -f $tempfile $backupfile
# Temporarily disabled until #324 is merged
#echo "5.2. Database is an old V1 database - upgrade"
#upgrade_ok_test $testdata/old_v1.sqlite3 $backupfile
#rm -f $tempfile $backupfile
echo "5.2. Database is an old V1 database - upgrade"
upgrade_ok_test $testdata/old_v1.sqlite3 $backupfile
rm -f $tempfile $backupfile
# Temporarily disabled until #324 is merged
#echo "6.1. Database is new V1 database - check"
#check_version $testdata/new_v1.sqlite3 "V1.0"
#check_no_backup $tempfile $backupfile
#rm -f $tempfile $backupfile
echo "6.1. Database is new V1 database - check"
check_version $testdata/new_v1.sqlite3 "V1.0"
check_no_backup $tempfile $backupfile
rm -f $tempfile $backupfile
# Temporarily disabled until #324 is merged
#echo "6.2. Database is a new V1 database - upgrade"
#upgrade_ok_test $testdata/new_v1.sqlite3 $backupfile
#rm -f $tempfile $backupfile
echo "6.2. Database is a new V1 database - upgrade"
upgrade_ok_test $testdata/new_v1.sqlite3 $backupfile
rm -f $tempfile $backupfile
echo "7.1. Database is V2.0 database - check"
......@@ -405,10 +402,9 @@ upgrade_fail_test $testdata/too_many_version.sqlite3 $backupfile
rm -f $tempfile $backupfile
# Temporarily disabled until #324 is merged
#echo "10.0. Upgrade corrupt database"
#upgrade_fail_test $testdata/corrupt.sqlite3 $backupfile
#rm -f $tempfile $backupfile
echo "10.0. Upgrade corrupt database"
upgrade_fail_test $testdata/corrupt.sqlite3 $backupfile
rm -f $tempfile $backupfile
echo "11. Record count test"
......@@ -447,15 +443,14 @@ copy_file $testdata/old_v1.sqlite3 $tempfile
passzero $?
rm -f $tempfile $backupfile
# Temporarily disabled until #324 is merged
#echo "13.3 Interactive prompt - yes"
#copy_file $testdata/old_v1.sqlite3 $tempfile
#../run_dbutil.sh --upgrade $tempfile << .
#Yes
#.
#passzero $?
#check_version $tempfile "V2.0"
#rm -f $tempfile $backupfile
echo "13.3 Interactive prompt - yes"
copy_file $testdata/old_v1.sqlite3 $tempfile
../run_dbutil.sh --upgrade $tempfile << .
Yes
.
passzero $?
check_version $tempfile "V2.0"
rm -f $tempfile $backupfile
echo "13.4 Interactive prompt - no"
copy_file $testdata/old_v1.sqlite3 $tempfile
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment