Update test cases to account for the change in the previous commit.

FossilOrigin-Name: ae089ec881beb1c2d278303ba964aaeffad1afe4

diff --git a/manifest b/manifest
index 7dd2eb66e6a68066f14b38485370371c7ffb3746..d01e3580e29f1c4341bfe65e857e8fe649937099 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Modify\sthe\sinterface\sto\sthe\sblocking\swal-checkpoint\sfunctionality.
-D 2010-11-18T12:11:05
+C Update\stest\scases\sto\saccount\sfor\sthe\schange\sin\sthe\sprevious\scommit.
+D 2010-11-18T16:14:24
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in e7a59672eaeb04408d1fa8501618d7501a3c5e39
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -256,7 +256,7 @@ F test/async2.test bf5e2ca2c96763b4cba3d016249ad7259a5603b6
 F test/async3.test 93edaa9122f498e56ea98c36c72abc407f4fb11e
 F test/async4.test 1787e3952128aa10238bf39945126de7ca23685a
 F test/async5.test f3592d79c84d6e83a5f50d3fd500445f7d97dfdf
-F test/attach.test ce9660e51768fab93cf129787be886c5d6c4fd81
+F test/attach.test f2b4ac6931f45695082b9f02be959c9c262e4f4d
 F test/attach2.test a295d2d7061adcee5884ef4a93c7c96a82765437
 F test/attach3.test bd9830bc3a0d22ed1310c9bff6896927937017dc
 F test/attachmalloc.test 1d5b821a676f7bf0b00d87cc106b78966789ba57
@@ -570,7 +570,7 @@ F test/notify3.test d60923e186e0900f4812a845fcdfd8eea096e33a
 F test/notnull.test cc7c78340328e6112a13c3e311a9ab3127114347
 F test/null.test a8b09b8ed87852742343b33441a9240022108993
 F test/openv2.test af02ed0a9cbc0d2a61b8f35171d4d117e588e4ec
-F test/pager1.test 07b06b89d50bc38bb118a18b99c7bee645b315de
+F test/pager1.test 1e07368795dc6205a046a7a29f4455a9d5195d19
 F test/pager2.test 0fbb6b6dc40ce1fecfe758c555a748ad2e9beaa3
 F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
 F test/pagerfault.test 9de4d3e0c59970b4c6cb8dac511fa242f335d8a7
@@ -823,9 +823,9 @@ 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 70227190e713b3e7eb2a7d5ec3510b66db01f327
-F test/wal2.test c794b8b257af54190bb913678ad3984cbf3311b9
-F test/wal3.test 957a5f2a8fe8a6ff01de1a15285ecf2f376fcaf8
+F test/wal.test dea22218fd68c61fe206f53d508a0552894144b7
+F test/wal2.test 894d55dda774340fe7bebe239bed9b6130ff23d7
+F test/wal3.test 55529a3fbf0a04670558dbf0b06f04a2f3508db4
 F test/wal4.test 3404b048fa5e10605facaf70384e6d2943412e30
 F test/wal5.test 4e2854d7584dd97a73e7ce0f47bcbbe5c592fe29
 F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
@@ -887,7 +887,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 7e3fc2c833a5baa08820c499867b6902bdc2ed5a
-R 1672f1722e4277222ee64bddb8543abf
+P 72787c010c8944e8fcf9c98aa4482f129142d8e9
+R e8b8625daa4f884d804e2c6d9b55ed2e
 U dan
-Z 2e080f5eeb72d6f9662d3b3c376a7b7c
+Z f89794a71de2f3c0c0dca2ba94548ae2

diff --git a/manifest.uuid b/manifest.uuid
index 3807e3880746accbe92ba5458850630fd47b8372..109db3b96b77c2028ae1d1cc1ad505135696e520 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-72787c010c8944e8fcf9c98aa4482f129142d8e9
\ No newline at end of file
+ae089ec881beb1c2d278303ba964aaeffad1afe4
\ No newline at end of file

diff --git a/test/attach.test b/test/attach.test
index 61e1272e74034763ca0ce93224b1b851eee408a9..a5af8f751d2a7979a335922b813da8001ee5fcca 100644 (file)
--- a/test/attach.test
+++ b/test/attach.test
@@ -835,4 +835,5 @@ do_test attach-10.2 {
     PRAGMA database_list;
   }] 9 end
 } {4 noname {} 5 inmem {}}
+
 finish_test

diff --git a/test/pager1.test b/test/pager1.test
index dfc49af8b5b053ad8fa096990d24b84aa2b3f108..79a04caffbe61201b5f3e11399814b13ff30d6e6 100644 (file)
--- a/test/pager1.test
+++ b/test/pager1.test
@@ -1992,7 +1992,7 @@ do_test pager1-22.1.1 {
     INSERT INTO ko DEFAULT VALUES;
   }
   execsql { PRAGMA wal_checkpoint }
-} {}
+} {0 -1 -1}
 do_test pager1-22.2.1 {
   testvfs tv -default 1
   tv filter xSync

diff --git a/test/wal.test b/test/wal.test
index 1db08b5ec9cd6735b5df5e147ea268c2a12234cf..70dabda6b3905ece13934079a7fb2fb69633becb 100644 (file)
--- a/test/wal.test
+++ b/test/wal.test
@@ -287,8 +287,8 @@ do_test wal-4.6.1 {
         INSERT INTO t2 VALUES('y', 'z');
       ROLLBACK TO save;
     COMMIT;
-    SELECT * FROM t2;
   }
+  execsql { SELECT * FROM t2 }
 } {w x}
 
 
@@ -542,7 +542,7 @@ do_multiclient_test tn {
   } {1 2 3 4 5 6 7 8 9 10}
   do_test wal-10.$tn.12 {
     catchsql { PRAGMA wal_checkpoint } 
-  } {0 {}}   ;# Reader no longer block checkpoints
+  } {0 {0 13 13}}   ;# Reader no longer block checkpoints
   do_test wal-10.$tn.13 {
     execsql { INSERT INTO t1 VALUES(11, 12) }
     sql2 {SELECT * FROM t1}
@@ -552,7 +552,7 @@ do_multiclient_test tn {
   #
   do_test wal-10.$tn.14 {
     catchsql { PRAGMA wal_checkpoint } 
-  } {0 {}}
+  } {0 {0 15 13}}
 
   # The following series of test cases used to verify another blocking
   # case in WAL - a case which no longer blocks.
@@ -562,10 +562,10 @@ do_multiclient_test tn {
   } {1 2 3 4 5 6 7 8 9 10 11 12}
   do_test wal-10.$tn.16 {
     catchsql { PRAGMA wal_checkpoint } 
-  } {0 {}}
+  } {0 {0 15 15}}
   do_test wal-10.$tn.17 {
     execsql { PRAGMA wal_checkpoint } 
-  } {}
+  } {0 15 15}
   do_test wal-10.$tn.18 {
     sql3 { BEGIN; SELECT * FROM t1 }
   } {1 2 3 4 5 6 7 8 9 10 11 12}
@@ -588,13 +588,13 @@ do_multiclient_test tn {
   #
   do_test wal-10.$tn.23 {
     execsql { PRAGMA wal_checkpoint }
-  } {}
+  } {0 17 17}
   do_test wal-10.$tn.24 {
     sql2 { BEGIN; SELECT * FROM t1; }
   } {1 2 3 4 5 6 7 8 9 10 11 12 13 14}
   do_test wal-10.$tn.25 {
     execsql { PRAGMA wal_checkpoint }
-  } {}
+  } {0 17 17}
   do_test wal-10.$tn.26 {
     catchsql { INSERT INTO t1 VALUES(15, 16) }
   } {0 {}}
@@ -611,11 +611,11 @@ do_multiclient_test tn {
   do_test wal-10.$tn.29 {
     execsql { INSERT INTO t1 VALUES(19, 20) }
     catchsql { PRAGMA wal_checkpoint }
-  } {0 {}}
+  } {0 {0 6 0}}
   do_test wal-10.$tn.30 {
     code3 { sqlite3_finalize $::STMT }
     execsql { PRAGMA wal_checkpoint }
-  } {}
+  } {0 6 0}
 
   # At one point, if a reader failed to upgrade to a writer because it
   # was reading an old snapshot, the write-locks were not being released.
@@ -654,7 +654,7 @@ do_multiclient_test tn {
   } {a b c d}
   do_test wal-10.$tn.36 {
     catchsql { PRAGMA wal_checkpoint }
-  } {0 {}}
+  } {0 {0 16 16}}
   do_test wal-10.$tn.36 {
     sql3 { INSERT INTO t1 VALUES('e', 'f') }
     sql2 { SELECT * FROM t1 }
@@ -662,7 +662,7 @@ do_multiclient_test tn {
   do_test wal-10.$tn.37 {
     sql2 COMMIT
     execsql { PRAGMA wal_checkpoint }
-  } {}
+  } {0 18 18}
 }
 
 #-------------------------------------------------------------------------
@@ -797,8 +797,8 @@ do_test wal-12.5 {
     UPDATE t1 SET y = 1 WHERE x = 'A';
     PRAGMA wal_checkpoint;
     UPDATE t1 SET y = 0 WHERE x = 'A';
-    SELECT * FROM t2;
   }
+  execsql {  SELECT * FROM t2 }
 } {B 2}
 do_test wal-12.6 {
   file copy -force test.db test2.db
@@ -1029,14 +1029,14 @@ catch { db close }
 foreach {tn ckpt_cmd ckpt_res ckpt_main ckpt_aux} {
   1 {sqlite3_wal_checkpoint db}              SQLITE_OK     1 1
   2 {sqlite3_wal_checkpoint db ""}           SQLITE_OK     1 1
-  3 {db eval "PRAGMA wal_checkpoint"}        {}            1 1
+  3 {db eval "PRAGMA wal_checkpoint"}        {0 16 16}     1 1
 
   4 {sqlite3_wal_checkpoint db main}         SQLITE_OK     1 0
   5 {sqlite3_wal_checkpoint db aux}          SQLITE_OK     0 1
   6 {sqlite3_wal_checkpoint db temp}         SQLITE_OK     0 0
-  7 {db eval "PRAGMA main.wal_checkpoint"}   {}            1 0
-  8 {db eval "PRAGMA aux.wal_checkpoint"}    {}            0 1
-  9 {db eval "PRAGMA temp.wal_checkpoint"}   {}            0 0
+  7 {db eval "PRAGMA main.wal_checkpoint"}   {0 10 10}     1 0
+  8 {db eval "PRAGMA aux.wal_checkpoint"}    {0 16 16}     0 1
+  9 {db eval "PRAGMA temp.wal_checkpoint"}   {0 -1 -1}     0 0
 } {
   do_test wal-16.$tn.1 {
     file delete -force test2.db test2.db-wal test2.db-journal
@@ -1400,10 +1400,8 @@ do_test wal-20.2 {
 } {0}
 do_test wal-20.3 {
   close $::buddy
-  execsql {
-    PRAGMA wal_checkpoint;
-    SELECT count(*) FROM t1;
-  }
+  execsql { PRAGMA wal_checkpoint }
+  execsql { SELECT count(*) FROM t1 }
 } {16384}
 do_test wal-20.4 {
   db close
@@ -1437,8 +1435,8 @@ do_test wal-21.2 {
         INSERT INTO t1 SELECT randomblob(900), randomblob(900) FROM t1;
       ROLLBACK TO s;
     COMMIT;
-    SELECT * FROM t1;
   }
+  execsql { SELECT * FROM t1 }
 } {1 2 3 4 5 6 7 8 9 10 11 12}
 do_test wal-21.3 {
   execsql { PRAGMA integrity_check }

diff --git a/test/wal2.test b/test/wal2.test
index a62e9b99e6554b7f3aa8469a44cfe050b3c6d493..299afa4f79958253da274d282a23bf1d627623b4 100644 (file)
--- a/test/wal2.test
+++ b/test/wal2.test
@@ -346,7 +346,7 @@ do_test wal2-4.1 {
     INSERT INTO data VALUES('need xShmOpen to see this');
     PRAGMA wal_checkpoint;
   }
-} {wal}
+} {wal 0 5 5}
 do_test wal2-4.2 {
   db close
   testvfs tvfs -noshm 1
@@ -712,7 +712,7 @@ do_test wal2-6.5.1 {
     INSERT INTO t2 VALUES('I', 'II');
     PRAGMA journal_mode;
   }
-} {wal exclusive wal}
+} {wal exclusive 0 3 3 wal}
 do_test wal2-6.5.2 {
   execsql {
     PRAGMA locking_mode = normal;
@@ -723,7 +723,7 @@ do_test wal2-6.5.2 {
 } {normal exclusive I II III IV}
 do_test wal2-6.5.3 {
   execsql { PRAGMA wal_checkpoint }
-} {}
+} {0 4 4}
 db close
 
 proc lock_control {method filename handle spec} {
@@ -807,9 +807,9 @@ do_test wal2-8.1.2 {
     CREATE TABLE t1(x);
     INSERT INTO t1 VALUES(zeroblob(8188*1020));
     CREATE TABLE t2(y);
+    PRAGMA wal_checkpoint;
   }
   execsql {
-    PRAGMA wal_checkpoint;
     SELECT rootpage>=8192 FROM sqlite_master WHERE tbl_name = 't2';
   }
 } {1}

diff --git a/test/wal3.test b/test/wal3.test
index c57132e070d6c01a82ead8749240a6599a9747bc..84e321c27f4ecb47edf7236fc10044e55de93435 100644 (file)
--- a/test/wal3.test
+++ b/test/wal3.test
@@ -427,7 +427,7 @@ do_test wal3-6.1.2 {
 } {o t t f}
 do_test wal3-6.1.3 {
   execsql { PRAGMA wal_checkpoint } db2
-} {}
+} {0 7 7}
 
 # At this point the log file has been fully checkpointed. However, 
 # connection [db3] holds a lock that prevents the log from being wrapped.
@@ -515,7 +515,7 @@ proc lock_callback {method file handle spec} {
 }
 do_test wal3-6.2.2 {
   execsql { PRAGMA wal_checkpoint }
-} {}
+} {0 7 7}
 do_test wal3-6.2.3 {
   set ::R
 } {h h l b}
@@ -624,7 +624,7 @@ do_test wal3-8.1 {
     INSERT INTO b VALUES('Markazi');
     PRAGMA wal_checkpoint;
   }
-} {wal}
+} {wal 0 9 9}
 do_test wal3-8.2 {
   execsql { SELECT * FROM b }
 } {Tehran Qom Markazi}