From: mistachkin <mistachkin@noemail.net>
Date: Mon, 23 Oct 2017 20:17:19 +0000 (+0000)
Subject: In the 'swarmvtabfault' test module, make sure to close the database handle prior... 
X-Git-Tag: version-3.21.0~3^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0295774ca0d2d33c7644688be3624433e29ab84b;p=thirdparty%2Fsqlite.git

In the 'swarmvtabfault' test module, make sure to close the database handle prior to raising an error from the 'not found' callback script.

FossilOrigin-Name: f317037b31b19007e30bb41c54506d9d241a6d590c2b31e2ddda10d4f6e7605b
---

diff --git a/manifest b/manifest
index 336384dfde..2cb9e12473 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Cleanup\sa\stest\sdatabase\sfile\sprior\sto\susing\sit.
-D 2017-10-23T17:36:52.561
+C In\sthe\s'swarmvtabfault'\stest\smodule,\smake\ssure\sto\sclose\sthe\sdatabase\shandle\sprior\sto\sraising\san\serror\sfrom\sthe\s'not\sfound'\scallback\sscript.
+D 2017-10-23T20:17:19.102
 F Makefile.in e016061b23e60ac9ec27c65cb577292b6bde0307ca55abd874ab3487b3b1beb2
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 37740aba9c4bb359c627eadccf1cfd7be4f5f847078723777ea7763969e533b1
@@ -1251,7 +1251,7 @@ F test/subtype1.test 7fe09496352f97053af1437150751be2d0a0cae8
 F test/superlock.test ec94f0556b6488d97f71c79f9061ae08d9ab8f12
 F test/swarmvtab.test 05c4ca7b6ab0cc6f4c335a510347f99d741fa71366004699cf7dfa3cff4e2d17
 F test/swarmvtab2.test 038ef9bcad6fd2fb9e395196080cf23e223ddb1219015049a61540c161bc577d
-F test/swarmvtabfault.test f8ae84cd44454555386c393892280f85f5ab35dcd0797641830fd7ebbfcc9d15
+F test/swarmvtabfault.test 00aec54665909490f5c383f3cae3b5d18bd97c12490b429ff8752a3027acfa42
 F test/symlink.test c9ebe7330d228249e447038276bfc8a7b22f4849
 F test/sync.test 2f84bdbc2b2df1fcb0220575b4b9f8cea94b7529
 F test/sync2.test 6be8ed007fa063b147773c1982b5bdba97a32badc536bdc6077eff5cf8710ece
@@ -1664,7 +1664,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 c8b8b9b573665c2b4d278bb679a48ac407374b8d860f0c3f4d50a303043464ad
-R 8a4b9bbdc7dfd424f00b7f6b2d5817a7
+P e1bf5e1d06dbe573671c6b5472b45f5bfa3cf82374f70a76b4c80815bf15a29b
+R c767dcd50a85f97407be83eb8fcdc039
 U mistachkin
-Z b3872513ac1c114df2a01eba444b5f49
+Z 6d76c482979023bebbeef80b070aef99
diff --git a/manifest.uuid b/manifest.uuid
index 3ab3d6091f..0c9cd50350 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e1bf5e1d06dbe573671c6b5472b45f5bfa3cf82374f70a76b4c80815bf15a29b
\ No newline at end of file
+f317037b31b19007e30bb41c54506d9d241a6d590c2b31e2ddda10d4f6e7605b
\ No newline at end of file
diff --git a/test/swarmvtabfault.test b/test/swarmvtabfault.test
index dfdd16705b..083d80df2e 100644
--- a/test/swarmvtabfault.test
+++ b/test/swarmvtabfault.test
@@ -24,8 +24,11 @@ ifcapable !vtab {
 proc fetch_db {file} {
   forcedelete $file
   sqlite3 dbX $file
-  dbX eval { CREATE TABLE t1(a INTEGER PRIMARY KEY, b) }
+  set rc [catch {
+    dbX eval { CREATE TABLE t1(a INTEGER PRIMARY KEY, b) }
+  } res]
   dbX close
+  if {$rc!=0} {error $res}
 }
 
 forcedelete test.db1