From 7b812b6b16b7a4374857d104afbdcca938c13b87 Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Wed, 5 Dec 2018 18:25:23 +0000
Subject: [PATCH] Add test cases to wal2concurrent.test.

FossilOrigin-Name: ef9e7a87a4ce4fe9596aed2f880f2b9fc3526c00c48f2868c625a4c24be65abe
---
 manifest                 |  12 ++--
 manifest.uuid            |   2 +-
 test/wal2concurrent.test | 125 +++++++++++++++++++++++----------------
 3 files changed, 80 insertions(+), 59 deletions(-)

diff --git a/manifest b/manifest
index 13f57465e0..7506b17af3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stest\sscript\sproblem\son\sthis\sbranch.
-D 2018-12-05T17:36:20.846
+C Add\stest\scases\sto\swal2concurrent.test.
+D 2018-12-05T18:25:23.042
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in a050c8670ea0d7b37b2192306cbb50d392acd9902b84e9b56f3444d006f97a6c
@@ -1606,7 +1606,7 @@ F test/vtab_err.test dcc8b7b9cb67522b3fe7a272c73856829dae4ab7fdb30399aea1b6981bd
 F test/vtab_shared.test 5253bff2355a9a3f014c15337da7e177ab0ef8ad
 F test/wal.test 613efec03e517e1775d86b993a54877d2e29a477
 F test/wal2.test a225bafac35a47765b890bacdeb57e5e81039f21cc18a1e8ce88eb76e56b843c
-F test/wal2concurrent.test d0af64c3b113993553acfeeb64d207fb6d924e498fd953dbf31040a566ec10df
+F test/wal2concurrent.test abb4c9d77e4cbd444aa95064f028805c2273c68440e45790b9da03f763fcad71
 F test/wal2rewrite.test 6ca6f631ffcf871240beab5f02608913fd075c6d0d31310b026c8383c65c9f9c
 F test/wal2simple.test 8c9dfb8f1bca01a0deb57f7074cdb83865c2292e89b13f7a51a1c160dca3f5f4
 F test/wal3.test 2a93004bc0fb2b5c29888964024695bade278ab2
@@ -1796,7 +1796,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 bf309107dfc4d2abd68b9339c68aeaaffd278096bb2a5912e4a0b0c124fd6345 285d1c5904dd607457c6b5ff7be3d3191a90ca8b1fb0837327663c9910f978ac
-R 95b9e871a13052b64e694448fd65a502
+P 692ddc280850ea2ff5d2fa3743f85fb123b4e4ebc452aae9c58b8d80d22b75b1
+R 70d5ec81123343dc4b5125cf054cd873
 U dan
-Z 1ca88420796234af6cf0aabbf996ef48
+Z e68147c0d113bb85826459be77b6127e
diff --git a/manifest.uuid b/manifest.uuid
index 30d584a429..5af0e23e2d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-692ddc280850ea2ff5d2fa3743f85fb123b4e4ebc452aae9c58b8d80d22b75b1
\ No newline at end of file
+ef9e7a87a4ce4fe9596aed2f880f2b9fc3526c00c48f2868c625a4c24be65abe
\ No newline at end of file
diff --git a/test/wal2concurrent.test b/test/wal2concurrent.test
index db0c8485b9..3375978bec 100644
--- a/test/wal2concurrent.test
+++ b/test/wal2concurrent.test
@@ -1,4 +1,4 @@
-# 2015 July 26
+# 2018 December 6
 #
 # The author disclaims copyright to this source code.  In place of
 # a legal notice, here is a blessing:
@@ -24,61 +24,82 @@ ifcapable !concurrent {
 #-------------------------------------------------------------------------
 # Warm-body test.
 #
-sqlite3 db2 test.db
-do_execsql_test 1.0 {
-  PRAGMA page_size = 1024;
-  CREATE TABLE t1(x);
-  CREATE TABLE t2(y);
-  PRAGMA journal_size_limit = 5000;
-  PRAGMA journal_mode = wal2;
-} {5000 wal2}
-
-do_execsql_test 1.1 {
-  INSERT INTO t1 VALUES(1);
-  BEGIN CONCURRENT;
-    INSERT INTO t1 VALUES(2);
-} {}
-
-do_test 1.2 {
-  execsql { 
+foreach tn {1 2} {
+  reset_db
+  sqlite3 db2 test.db
+  do_execsql_test 1.0 {
+    PRAGMA page_size = 1024;
+    CREATE TABLE t1(x);
+    CREATE TABLE t2(y);
     PRAGMA journal_size_limit = 5000;
-    INSERT INTO t1 VALUES(3) 
-  } db2
-  catchsql { COMMIT }
-} {1 {database is locked}}
-
-do_catchsql_test 1.3 { COMMIT   } {1 {database is locked}}
-do_catchsql_test 1.4 { ROLLBACK } {0 {}}
-
-do_test 1.5 {
-  list [file size test.db-wal] [file size test.db-wal2]
-} {2128 0}
+    PRAGMA journal_mode = wal2;
+  } {5000 wal2}
+  
+  do_execsql_test 1.1 {
+    INSERT INTO t1 VALUES(1);
+    BEGIN CONCURRENT;
+      INSERT INTO t1 VALUES(2);
+  } {}
+  
+  do_test 1.2 {
+    execsql { 
+      PRAGMA journal_size_limit = 5000;
+      INSERT INTO t1 VALUES(3) 
+    } db2
+    catchsql { COMMIT }
+  } {1 {database is locked}}
+  
+  do_catchsql_test 1.3 { COMMIT   } {1 {database is locked}}
+  do_catchsql_test 1.4 { ROLLBACK } {0 {}}
+  
+  do_test 1.5 {
+    list [file size test.db-wal] [file size test.db-wal2]
+  } {2128 0}
+  
+  do_execsql_test 1.6 {
+    BEGIN CONCURRENT;
+      INSERT INTO t1 VALUES(2);
+  } {}
+  
+  do_test 1.7 {
+    execsql { INSERT INTO t2 VALUES(randomblob(4000)) } db2
+    list [file size test.db-wal] [file size test.db-wal2]
+  } {7368 0}
+  
+  if {$tn==1} {
+    do_test 1.8 {
+      execsql { 
+        INSERT INTO t2 VALUES(1);
+        INSERT INTO t1 VALUES(5);
+      } db2
+      list [file size test.db-wal] [file size test.db-wal2]
+    } {7368 2128}
 
-do_execsql_test 1.6 {
-  BEGIN CONCURRENT;
-    INSERT INTO t1 VALUES(2);
-} {}
+    do_catchsql_test 1.9  { COMMIT   } {1 {database is locked}}
+    do_catchsql_test 1.10 { ROLLBACK } {0 {}}
+    db close
+    sqlite3 db test.db
+    do_execsql_test 1.11 { SELECT * FROM t1 } {1 3 5}
+    do_execsql_test 1.12 { SELECT count(*) FROM t2 } {2}
+  } else {
+    do_test 1.8 {
+      execsql { 
+        INSERT INTO t2 VALUES(1);
+      } db2
+      list [file size test.db-wal] [file size test.db-wal2]
+    } {7368 1080}
 
-do_test 1.7 {
-  execsql { INSERT INTO t2 VALUES(randomblob(4000)) } db2
-  list [file size test.db-wal] [file size test.db-wal2]
-} {7368 0}
+    do_catchsql_test 1.9  { COMMIT   } {0 {}}
+    db close
+    sqlite3 db test.db
+    do_execsql_test 1.11 { SELECT * FROM t1 } {1 3 2}
+    do_execsql_test 1.12 { SELECT count(*) FROM t2 } {2}
 
-do_test 1.8 {
-  execsql { 
-    INSERT INTO t2 VALUES(1);
-    INSERT INTO t1 VALUES(5);
-  } db2
-  list [file size test.db-wal] [file size test.db-wal2]
-} {7368 2128}
-
-do_catchsql_test 1.9  { COMMIT   } {1 {database is locked}}
-do_catchsql_test 1.10 { ROLLBACK } {0 {}}
-
-db close
-sqlite3 db test.db
-do_execsql_test 1.11 { SELECT * FROM t1 } {1 3 5}
-do_execsql_test 1.12 { SELECT count(*) FROM t2 } {2}
+    do_test 1.13 {
+      list [file size test.db-wal] [file size test.db-wal2]
+    } {7368 2128}
+  }
+}
 
 finish_test
 
-- 
2.47.2