Update test file exclusive.test so that it works with the "journaltest" permutation.

FossilOrigin-Name: 4daf94d83319231e42243625c804d5db2d14f10fa5ea1a1f358c3603c47b955b

diff --git a/manifest b/manifest
index e4998aff52e1ecbbe19e812c85b434bdc0680915..3b447564e82ee5853e7a49d83b3ae0ea6aa9a532 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\susing\sviews\sin\sSQLITE_OMIT_VIRTUAL_TABLE\sbuilds.\sAlso\ssome\stest\scase\sfixes\srequired\sfor\sthe\ssame\sbuilds.
-D 2020-01-21T16:23:17.784
+C Update\stest\sfile\sexclusive.test\sso\sthat\sit\sworks\swith\sthe\s"journaltest"\spermutation.
+D 2020-01-21T16:31:26.158
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -854,7 +854,7 @@ F test/enc4.test c8f1ce3618508fd0909945beb8b8831feef2c020
 F test/eqp.test 84879b63e3110552bf8ce648a3507dc3ceb72109ecec83c2aef0db37a27f6382
 F test/errmsg.test eae9f091eb39ce7e20305de45d8e5d115b68fa856fba4ea6757b6ca3705ff7f9
 F test/eval.test a64c9105d6ff163df7cf09d6ac29cdad5922078c
-F test/exclusive.test d6ccc6acc5d660544f8e0cacaec2c620f8ebb42a764d783ab53430e26057a185
+F test/exclusive.test 7ff63be7503990921838d5c9f77f6e33e68e48ed1a9d48cd28745bf650bf0747
 F test/exclusive2.test 984090e8e9d1b331d2e8111daf6e5d61dda0bef7
 F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
 F test/exists.test 79a75323c78f02bbe9c251ea502a092f9ef63dac
@@ -1857,7 +1857,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 d241055ead935f0e461a67f483788bcd59f7e8d65ade54b9c7c7c4fec9414102
-R f76ed78deea8ecda656692c47e3b99f8
+P 934ee8bdb481a5cbd3d9c5f53028073129d3bca4fee14fe4a49bbf9c0c9d74f7
+R 5a98666c879217368b8f21c26d062d92
 U dan
-Z f02cf9c138fa976fbef3a11edcb33089
+Z 3d15e2ce9b58e3608f870860fed31373

diff --git a/manifest.uuid b/manifest.uuid
index 6cae8ce5f9007c46040143be82ae06b5109fa4e6..8837b7b4614856ce3a2bf54774ce503c5f5341f0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-934ee8bdb481a5cbd3d9c5f53028073129d3bca4fee14fe4a49bbf9c0c9d74f7
\ No newline at end of file
+4daf94d83319231e42243625c804d5db2d14f10fa5ea1a1f358c3603c47b955b
\ No newline at end of file

diff --git a/test/exclusive.test b/test/exclusive.test
index 5168fa74823f0af4f575f7900b8ffd4ef3fa5122..494ede7f7660b9e3000cc06a605406157559d8fc 100644 (file)
--- a/test/exclusive.test
+++ b/test/exclusive.test
@@ -512,21 +512,27 @@ do_execsql_test exclusive-6.5 {
 } {exclusive}
 
 # 2019-12-26 ticket fb3b3024ea238d5c
-do_test exclusive-7.1 {
-  db close
-  forcedelete test.db test.db-journal test.db-wal
-  sqlite3 db test.db
-  # The following sequence of pragmas would trigger an assert()
-  # associated with Pager.changeCountDone inside of assert_pager_state(),
-  # prior to the fix.
-  db eval {
-    PRAGMA locking_mode = EXCLUSIVE;
-    PRAGMA journal_mode = WAL;
-    PRAGMA locking_mode = NORMAL;
-    PRAGMA user_version;
-    PRAGMA journal_mode = DELETE;
-  }
-} {exclusive wal normal 0 delete}
+if {[permutation]!="journaltest"} {
+  # The custom VFS used by the "journaltest" permutation cannot open the
+  # shared-memory file. So, while it is able to switch the db file to
+  # journal_mode=WAL when locking_mode=EXCLUSIVE, it can no longer access
+  # it once the locking_mode is changed back to NORMAL.
+  do_test exclusive-7.1 {
+    db close
+    forcedelete test.db test.db-journal test.db-wal
+    sqlite3 db test.db
+    # The following sequence of pragmas would trigger an assert()
+    # associated with Pager.changeCountDone inside of assert_pager_state(),
+    # prior to the fix.
+    db eval {
+      PRAGMA locking_mode = EXCLUSIVE;
+      PRAGMA journal_mode = WAL;
+      PRAGMA locking_mode = NORMAL;
+      PRAGMA user_version;
+      PRAGMA journal_mode = DELETE;
+    }
+  } {exclusive wal normal 0 delete}
+}
  
 
 } ;# atomic_batch_write==0