database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-30 19:03:16 +03:00
Code Activity

Disable the new malloc-37 test when locking_mode==exclusive. The test

Browse Source 
basically works, but sometimes reports "database is locked" instead of
"out of memory" and that messes up the error reporting. (CVS 6811)

FossilOrigin-Name: 3b8f9dec24d06865455a75587bbfc199c19c6215
This commit is contained in:
drh
2009-06-24 13:13:45 +00:00
parent bfff79f125
commit c3927537d8
3 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
test/malloc.test
View File

@ -16,7 +16,7 @@
# to see what happens in the library if a malloc were to really fail
# due to an out-of-memory situation.
#
# $Id: malloc.test,v 1.80 2009/06/22 05:43:24 danielk1977 Exp $
# $Id: malloc.test,v 1.81 2009/06/24 13:13:45 drh Exp $
set testdir [file dirname $argv0]
source $testdir/tester.tcl
@ -843,26 +843,28 @@ do_malloc_test 36 -sqlprep {
# At one point, if an OOM occured immediately after obtaining a shared lock
# on the database file, the file remained locked. This test case ensures
# that bug has been fixed.
do_malloc_test 36 -tclprep {
sqlite3 db2 test.db
execsql {
CREATE TABLE t1(a, b);
INSERT INTO t1 VALUES(1, 2);
} db2
} -sqlbody {
SELECT * FROM t1;
} -cleanup {
# Try to write to the database using connection [db2]. If connection [db]
# has correctly released the shared lock, this write attempt should
# succeed. If [db] has not released the lock, this should hit an
# SQLITE_BUSY error.
do_test malloc-36.$zRepeat.${::n}.unlocked {
execsql {INSERT INTO t1 VALUES(3, 4)} db2
} {}
db2 close
# that bug has been fixed.i
if {[db eval {PRAGMA locking_mode}]!="exclusive"} {
do_malloc_test 37 -tclprep {
sqlite3 db2 test.db
execsql {
CREATE TABLE t1(a, b);
INSERT INTO t1 VALUES(1, 2);
} db2
} -sqlbody {
SELECT * FROM t1;
} -cleanup {
# Try to write to the database using connection [db2]. If connection [db]
# has correctly released the shared lock, this write attempt should
# succeed. If [db] has not released the lock, this should hit an
# SQLITE_BUSY error.
do_test malloc-36.$zRepeat.${::n}.unlocked {
execsql {INSERT INTO t1 VALUES(3, 4)} db2
} {}
db2 close
}
catch { db2 close }
}
catch { db2 close }
# Ensure that no file descriptors were leaked.
do_test malloc-99.X {