From: dan <dan@noemail.net>
Date: Mon, 31 May 2010 14:18:45 +0000 (+0000)
Subject: Update another test case in wal.test.
X-Git-Tag: version-3.7.2~328^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcb1169fb7291d577bc2d5b793a5c1dec7478e05;p=thirdparty%2Fsqlite.git

Update another test case in wal.test.

FossilOrigin-Name: 99fde69e61d12cf95b47db70c4647c30be2d2f45
---

diff --git a/manifest b/manifest
index 2b082de5a0..154faea197 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Change\sWAL\stest\scases\sto\saccount\sfor\sthe\simproved\sconcurrency\sin\sthe\snew\ncheckpoint\slogic.
-D 2010-05-31T13:11:49
+C Update\sanother\stest\scase\sin\swal.test.
+D 2010-05-31T14:18:46
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -764,7 +761,7 @@ F test/vtabE.test 7c4693638d7797ce2eda17af74292b97e705cc61
 F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
 F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
 F test/vtab_shared.test 0eff9ce4f19facbe0a3e693f6c14b80711a4222d
-F test/wal.test 24fb9f0e7eb7fc30b6ae216d59e31a6a21648b07
+F test/wal.test a54d9be9e82eede1653f7998723ead8ce8a1a580
 F test/wal2.test c58bb5b2fac48b8393909038ced730df5ad973b0
 F test/walbak.test e7650a26eb4b8abeca9b145b1af1e63026dde432
 F test/walcksum.test 4efa8fb88c32bed8288ea4385a9cc113a5c8f0bf
@@ -818,14 +815,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 9aa4243e0cedcc9204994d04af1b2b7a80c048bd
-R 72bbbb4220e5d5ecf9016be13b6d8c95
-U drh
-Z dd48911da91c10eed857c9b8bf3a4d73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFMA7WYoxKgR168RlERAkmEAKCAGuXlAbCYwPqWoxSSXRviFrwEIQCgiNnx
-saabtRhlvE/VE/M4AMJEkvk=
-=fgRj
------END PGP SIGNATURE-----
+P 2d6f2485053e6d2a67abda9a80693ca68f4556d2
+R 96c973c2add1d959c0397175c45f8914
+U dan
+Z f8f8c662a8539b2774c212781e3c8a24
diff --git a/manifest.uuid b/manifest.uuid
index b36d9eaa98..bc59db0aae 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2d6f2485053e6d2a67abda9a80693ca68f4556d2
\ No newline at end of file
+99fde69e61d12cf95b47db70c4647c30be2d2f45
\ No newline at end of file
diff --git a/test/wal.test b/test/wal.test
index de783088be..1c5f556309 100644
--- a/test/wal.test
+++ b/test/wal.test
@@ -1035,8 +1035,9 @@ do_test wal-15.3.3 {
   sqlite3_errmsg db
 } {database table is locked}
 
-# Also test that an error is returned if the db cannot be checkpointed
-# because of locks held by another connection.
+# Earlier versions returned an error is returned if the db cannot be 
+# checkpointed because of locks held by another connection. Check that
+# this is no longer the case.
 #
 sqlite3 db2 test.db
 do_test wal-15.4.1 {
@@ -1048,10 +1049,10 @@ do_test wal-15.4.1 {
 do_test wal-15.4.2 {
   execsql { COMMIT }
   sqlite3_wal_checkpoint db
-} {SQLITE_BUSY}
+} {SQLITE_OK}
 do_test wal-15.4.3 {
   sqlite3_errmsg db
-} {database is locked}
+} {not an error}
 
 # After [db2] drops its lock, [db] may checkpoint the db.
 #