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

Update tests so that they work properly even if the soft-heap-limit

Browse Source 
is set low. (CVS 4203)

FossilOrigin-Name: e01eb99edfa3390e97847a210532847cc64803da
This commit is contained in:
drh
2007-08-10 19:46:13 +00:00
parent 3a7fb7c459
commit b771228e9d
4 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/attach2.test
View File

@ -12,7 +12,7 @@
# focus of this script is testing the ATTACH and DETACH commands
# and related functionality.
#
# $Id: attach2.test,v 1.35 2006/01/03 00:33:50 drh Exp $
# $Id: attach2.test,v 1.36 2007/08/10 19:46:14 drh Exp $
#
set testdir [file dirname $argv0]
@ -212,6 +212,15 @@ do_test attach2-4.4 {
lock_status 4.4.1 db {main shared temp closed file2 unlocked}
lock_status 4.4.2 db2 {main unlocked temp closed file2 unlocked}
# We have to make sure that the cache_size and the soft_heap_limit
# are large enough to hold the entire change in memory. If either
# is set too small, then changes will spill to the database, forcing
# a reserved lock to promote to exclusive. That will mess up our
# test results.
set soft_limit [sqlite3_soft_heap_limit 0]
do_test attach2-4.5 {
# Handle 'db2' reserves file2.
execsql {BEGIN} db2
@ -314,6 +323,7 @@ do_test attach2-4.15 {
db close
db2 close
file delete -force test2.db
sqlite3_soft_heap_limit $soft_limit
# These tests - attach2-5.* - check that the master journal file is deleted
# correctly when a multi-file transaction is committed or rolled back.

12
test/capi3b.test
View File

@ -13,13 +13,21 @@
# particular the behavior of sqlite3_step() when trying to commit
# with lock contention.
#
# $Id: capi3b.test,v 1.3 2006/01/03 00:33:50 drh Exp $
# $Id: capi3b.test,v 1.4 2007/08/10 19:46:14 drh Exp $
#
set testdir [file dirname $argv0]
source $testdir/tester.tcl
# These tests depend on the pager holding changes in cache
# until it is time to commit. But that won't happen if the
# soft-heap-limit is set too low. So disable the soft heap limit
# for the duration of this test.
#
sqlite3_soft_heap_limit 0
set DB [sqlite3_connection_pointer db]
sqlite3 db2 test.db
set DB2 [sqlite3_connection_pointer db2]
@ -132,4 +140,6 @@ do_test capi3b-2.12 {
} {1 2 3 4}
catch {db2 close}
sqlite3_soft_heap_limit $soft_limit
finish_test