Changes to exclusive2.test to make it more deterministic.

FossilOrigin-Name: 84b0c2bc7125623be2ee526b5ca75e1b72debb93

diff --git a/manifest b/manifest
index f452235443ae39bc917cb94cd6610e9d1b185ada..341d671a0e62b17761da45fe9c9f1a1544139c15 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Rename\sthe\sPCache1.mxPinned\sfield\sto\sn90pct\s(since\sit\sis\s90%\sof\snMax)\sin\sorder\nto\sdistinguish\sit\sfrom\sPGroup.mxPinned.\s\sFix\sthe\scomputation\sof\sn90pct\sso\sthat\nit\sdoes\snot\soverflow\sadversely\son\sexcessively\slarge\scache\ssizes.
-D 2011-01-26T00:07:03.942
+C Changes\sto\sexclusive2.test\sto\smake\sit\smore\sdeterministic.
+D 2011-01-26T06:13:15
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in de6498556d536ae60bb8bb10e8c1ba011448658c
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -377,7 +374,7 @@ F test/enc4.test 4b575ef09e0eff896e73bd24076f96c2aa6a42de
 F test/eqp.test 69670e7919030f21de29fb99bf1d68f97aedcbdb
 F test/eval.test bc269c365ba877554948441e91ad5373f9f91be3
 F test/exclusive.test 53e1841b422e554cecf0160f937c473d6d0e3062
-F test/exclusive2.test c2f2b2242dc436a12df8dd531e06843053bd3b9a
+F test/exclusive2.test b65264c3e76e1db6c6eda15c02000a40743f6541
 F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
 F test/expr.test 620a636cf7b7d4e5834a0b9d83a4da372e24a7b7
 F test/fallocate.test 43dc34b8c24be6baffadc3b4401ee15710ce83c6
@@ -900,14 +897,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P c17703ec1e604934f8bd5b1f66f34b19d17a6d1f
-R 109c7d92ff691fdbec42c31d55aa6410
-U drh
-Z 0733d70beb9057473e955a3b5b264719
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFNP2WroxKgR168RlERArihAJ9FjxySq+QwzE3GYgMW9h2HMqvBogCfVKVW
-Qn6jaMIKh2jPgnqXtNc05Yk=
-=HMnc
------END PGP SIGNATURE-----
+P c85202baac49b22a4be36b9733d44f01d83edb28
+R 85ac3b6bb904f05f09996814ba9f096b
+U dan
+Z 780b8c90621146e71b5a8492b6618973

diff --git a/manifest.uuid b/manifest.uuid
index a8c99a89286b370f9555c84abee4b9bc8b5b6af9..cda47ecd869d8f29732968b99ccc0d784906eaf7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c85202baac49b22a4be36b9733d44f01d83edb28
\ No newline at end of file
+84b0c2bc7125623be2ee526b5ca75e1b72debb93
\ No newline at end of file

diff --git a/test/exclusive2.test b/test/exclusive2.test
index 4a167c7f428a340804555993570279a9fe138a3d..b2b98ff5c163ce22c478967ede5b46172a8bdaff 100644 (file)
--- a/test/exclusive2.test
+++ b/test/exclusive2.test
@@ -163,6 +163,7 @@ do_test exclusive2-1.10 {
 do_test exclusive2-1.11 {
   expr {[t1sig] eq $::sig}
 } {0}
+db2 close
 
 #--------------------------------------------------------------------
 # These tests - exclusive2-2.X - are similar to exclusive2-1.X, 
@@ -252,7 +253,6 @@ do_test exclusive2-2.8 {
 #
 
 db close
-db2 close
 catch {close $::fd}
 file delete -force test.db
 file delete -force test.db-journal
@@ -262,50 +262,51 @@ do_test exclusive2-3.0 {
   execsql {
     BEGIN;
     CREATE TABLE t1(a UNIQUE);
-    INSERT INTO t1 VALUES(randstr(10, 400));
-    INSERT INTO t1 VALUES(randstr(10, 400));
+    INSERT INTO t1 VALUES(randstr(200, 200));
+    INSERT INTO t1 VALUES(randstr(200, 200));
     COMMIT;
   }
   readPagerChangeCounter test.db
 } {1}
 do_test exclusive2-3.1 {
   execsql {
-    INSERT INTO t1 VALUES(randstr(10, 400));
+    INSERT INTO t1 VALUES(randstr(200, 200));
   }
   readPagerChangeCounter test.db
 } {2}
 do_test exclusive2-3.2 {
   execsql {
-    INSERT INTO t1 VALUES(randstr(10, 400));
+    INSERT INTO t1 VALUES(randstr(200, 200));
   }
   readPagerChangeCounter test.db
 } {3}
 do_test exclusive2-3.3 {
   execsql {
     PRAGMA locking_mode = exclusive;
-    INSERT INTO t1 VALUES(randstr(10, 400));
+    INSERT INTO t1 VALUES(randstr(200, 200));
   }
   readPagerChangeCounter test.db
 } {4}
 do_test exclusive2-3.4 {
+breakpoint
   execsql {
-    INSERT INTO t1 VALUES(randstr(10, 400));
+    INSERT INTO t1 VALUES(randstr(200, 200));
   }
   readPagerChangeCounter test.db
 } {4}
 do_test exclusive2-3.5 {
   execsql {
     PRAGMA locking_mode = normal;
-    INSERT INTO t1 VALUES(randstr(10, 400));
+    INSERT INTO t1 VALUES(randstr(200, 200));
   }
   readPagerChangeCounter test.db
-} {5}
+} {4}
 do_test exclusive2-3.6 {
   execsql {
-    INSERT INTO t1 VALUES(randstr(10, 400));
+    INSERT INTO t1 VALUES(randstr(200, 200));
   }
   readPagerChangeCounter test.db
-} {6}
+} {5}
 sqlite3_soft_heap_limit $cmdlinearg(soft-heap-limit)
 
 finish_test