Skip recently added test cases in nolock.test when running in

the inmemory_journal permutation.

FossilOrigin-Name: a1dcf7af42bb7394d46138318f9367fe9e8be560
This commit is contained in:
drh 2016-03-21 16:19:29 +00:00
parent 6369bc3fbb
commit 4567beefac
3 changed files with 39 additions and 36 deletions

View File

@ -1,5 +1,5 @@
C Remove\san\sunreachable\sbranch\sfrom\sthe\sunlink\sverification\slogic\sin\sthe\sUNIX\nVFS.
D 2016-03-21T16:06:42.310
C Skip\srecently\sadded\stest\scases\sin\snolock.test\swhen\srunning\sin\nthe\sinmemory_journal\spermutation.
D 2016-03-21T16:19:29.587
F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@ -918,7 +918,7 @@ F test/multiplex4.test e8ae4c4bd70606a5727743241f13b5701990abe4
F test/mutex1.test ea2cc74d97f077b9e74c84cbd024f14d79a8126f
F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660
F test/nan.test dacc57f80859c06a433d30839336fe227d2038b3
F test/nolock.test 96e922d2d3db71c2dd6557c98e8027a28277b415
F test/nolock.test f196cf8b8fbea4e2ca345140a2b3f3b0da45c76e
F test/notify1.test 669b2b743618efdc18ca4b02f45423d5d2304abf
F test/notify2.test 2ecabaa1305083856b7c39cf32816b612740c161
F test/notify3.test 10ff25cde502e72a92053a2f215d64bece4ef934
@ -1458,7 +1458,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 902f221754f3cc6fb4ae049c135f85efce604ed3
R 36c20d433515aed31fbc005a13e11c2d
P 4dc30cce7fdb7dba9a9aad96bb8b499b965610b2
R 1f352d94053f76691b11c27a8d4a5d8f
U drh
Z 514dfe801f60757ebd0519594eb7ecde
Z d3631fb4e80d910681e8351d2aa12531

View File

@ -1 +1 @@
4dc30cce7fdb7dba9a9aad96bb8b499b965610b2
a1dcf7af42bb7394d46138318f9367fe9e8be560

View File

@ -183,9 +183,11 @@ db2 close
db close
tvfs delete
# 2016-03-11: Make sure all works when transitioning to WAL mode under nolock.
#
do_test nolock-4.1 {
if {[permutation]!="inmemory_journal"} {
# 2016-03-11: Make sure all works when transitioning to WAL mode
# under nolock.
#
do_test nolock-4.1 {
forcedelete test.db
sqlite3 db file:test.db?nolock=1 -uri 1
db eval {
@ -194,10 +196,10 @@ do_test nolock-4.1 {
INSERT INTO t1 VALUES('youngling');
SELECT * FROM t1;
}
} {delete youngling}
db close
} {delete youngling}
db close
do_test nolock-4.2 {
do_test nolock-4.2 {
forcedelete test.db
sqlite3 db test.db
db eval {
@ -206,12 +208,13 @@ do_test nolock-4.2 {
INSERT INTO t1 VALUES('catbird');
SELECT * FROM t1;
}
} {wal catbird}
do_test nolock-4.3 {
} {wal catbird}
do_test nolock-4.3 {
db close
sqlite3 db file:test.db?nolock=1 -uri 1
set rc [catch {db eval {SELECT * FROM t1}} msg]
lappend rc $msg
} {1 {unable to open database file}}
} {1 {unable to open database file}}
}
finish_test