Modify lock.test to account for "PRAGMA lock_status" returning "unknown" for in-memory databases. (CVS 6287)

FossilOrigin-Name: 9a6e558ba6fe0b38376a85a6c1e2cea5570ea283
This commit is contained in:
danielk1977 2009-02-12 09:36:15 +00:00
parent f7f33fb08a
commit 1435ccd52b
3 changed files with 12 additions and 10 deletions

View File

@ -1,5 +1,5 @@
C Fix\sa\scase\swhere\sduring\sa\srollback\striggered\sby\san\sIO\sor\smalloc\serror\san\sunjournalled\sregion\sof\sthe\sdatabase\scould\sbe\swritten\sto\s(with\sit's\soriginal\sdata).\sThis\swas\scausing\san\sassert\sin\stest_journal.c\sto\sfail.\sAdd\sa\stest\scase\sin\sioerr2.test\sto\strigger\sthis\scase.\s(CVS\s6286)
D 2009-02-12T09:11:56
C Modify\slock.test\sto\saccount\sfor\s"PRAGMA\slock_status"\sreturning\s"unknown"\sfor\sin-memory\sdatabases.\s(CVS\s6287)
D 2009-02-12T09:36:16
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in c7a5a30fb6852bd7839b1024e1661da8549878ee
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -428,7 +428,7 @@ F test/like2.test 3b2ee13149ba4a8a60b59756f4e5d345573852da
F test/limit.test 2db7b3b34fb925b8e847d583d2eb67531d0ce67e
F test/loadext.test 18db29c081380fdedcfbd8c633847712059ae104
F test/loadext2.test 0bcaeb4d81cd5b6e883fdfea3c1bdbe1f173cbca
F test/lock.test 3f9e98e96d331ee3035303b7431bcaac5fb087e3
F test/lock.test 9c06ddc3a094a78ed7e49d15165b3fc458bcbfc7
F test/lock2.test d4f941d1f659e5fc782b4912b1a872d77d4b5470
F test/lock3.test 8adfbf438b96316267611214d494ebc1311b8cda
F test/lock4.test 991b57669a868bbfd39fe0c0df0d493985829105
@ -701,7 +701,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
P 2522ad1df3599fa71cd1d929142adaefaf3a4d67
R 4c4c89955f208108534627e9cec8b7dc
P 315a6692f9a03a470871cce4f74567683546f343
R 1abda3a7b35e49a2059fb89335dadc90
U danielk1977
Z 02ac569d1f9ca588465f8c431f417f64
Z c133c9a064c489558fdd1f698bbbb675

View File

@ -1 +1 @@
315a6692f9a03a470871cce4f74567683546f343
9a6e558ba6fe0b38376a85a6c1e2cea5570ea283

View File

@ -11,7 +11,7 @@
# This file implements regression tests for SQLite library. The
# focus of this script is database locks.
#
# $Id: lock.test,v 1.36 2009/01/17 16:59:41 danielk1977 Exp $
# $Id: lock.test,v 1.37 2009/02/12 09:36:16 danielk1977 Exp $
set testdir [file dirname $argv0]
@ -397,13 +397,15 @@ do_test lock-6.5 {
# * there exists one or more active read-only statements, and
# * a transaction that modified zero database pages is committed.
#
set temp_status unlocked
if {$TEMP_STORE==3} {set temp_status unknown}
do_test lock-7.1 {
set STMT [sqlite3_prepare $DB "SELECT * FROM sqlite_master" -1 TAIL]
sqlite3_step $STMT
} {SQLITE_ROW}
do_test lock-7.2 {
execsql { PRAGMA lock_status }
} {main shared temp unlocked}
} [list main shared temp $temp_status]
do_test lock-7.3 {
execsql {
PRAGMA journal_mode = truncate;
@ -412,7 +414,7 @@ do_test lock-7.3 {
COMMIT;
}
execsql { PRAGMA lock_status }
} {main shared temp unlocked}
} [list main shared temp $temp_status]
do_test lock-7.4 {
sqlite3_finalize $STMT
} {SQLITE_OK}