aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordan <dan@noemail.net>2017-02-07 14:22:39 +0000
committerdan <dan@noemail.net>2017-02-07 14:22:39 +0000
commit821fad51b4b93980dca0b886b760645d097b41ab (patch)
tree875fd644b3ada47c48b6ab131b206f0d634e0a4f
parent364ca6a90e59f6453ff4b136fbce617f8743649a (diff)
downloadsqlite-821fad51b4b93980dca0b886b760645d097b41ab.tar.gz
sqlite-821fad51b4b93980dca0b886b760645d097b41ab.zip
Fix a test case to account for the fact that sqlite3_blob_reopen() now returns
SQLITE_IOERR_NOMEM instead of SQLITE_NOMEM if an OOM occurs in the VFS layer. FossilOrigin-Name: e11cc52389f61f6421179281877b119c02286121
-rw-r--r--manifest14
-rw-r--r--manifest.uuid2
-rw-r--r--test/incrblobfault.test2
3 files changed, 9 insertions, 9 deletions
diff --git a/manifest b/manifest
index 1e7c95b55..eb4d617f5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sSQLITE_BYTEORDER\s#defines\sin\sR-Tree\swhen\scompiled\sseparately\sfrom\sthe\namalgamation.
-D 2017-02-07T13:51:48.651
+C Fix\sa\stest\scase\sto\saccount\sfor\sthe\sfact\sthat\ssqlite3_blob_reopen()\snow\sreturns\nSQLITE_IOERR_NOMEM\sinstead\sof\sSQLITE_NOMEM\sif\san\sOOM\soccurs\sin\sthe\sVFS\slayer.
+D 2017-02-07T14:22:39.073
F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc ba953c8921fc7e18333f61898007206de7e23964
@@ -851,7 +851,7 @@ F test/incrblob2.test a5ce5ed1d0b01e2ed347245a21170372528af0a5
F test/incrblob3.test d8d036fde015d4a159cd3cbae9d29003b37227a4
F test/incrblob4.test 21a52a6843a56cdcce968c6a86b72a7066d0e6ba
F test/incrblob_err.test 69f9247fed50278d48ea710d1a8f9cdb09e4c0b8
-F test/incrblobfault.test 280474078f6da9e732cd2a215d3d854969014b6e
+F test/incrblobfault.test 74dd8ac108304cea0b4a0df6df63a1567e558758
F test/incrcorrupt.test 6c567fbf870aa9e91866fe52ce6f200cd548939a
F test/incrvacuum.test d2a6ddf5e429720b5fe502766af747915ccf6c32
F test/incrvacuum2.test 7d26cfda66c7e55898d196de54ac4ec7d86a4e3d
@@ -1554,7 +1554,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 07fe6228208684d579c4f6c334c90eb6262a9233
-R fb7b4c31979a0a5dd9190e2f71115220
-U drh
-Z e9cc05bda60d84b045dd690e40ba6bd5
+P a136609c98ed3cc673c5a3c2578d49db3f2518d1
+R b322167caccfbef7ed8b051ff68195b2
+U dan
+Z ce20f1c1fe7e20be76a40b05210db04c
diff --git a/manifest.uuid b/manifest.uuid
index cbfdaf943..dd14d6d04 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a136609c98ed3cc673c5a3c2578d49db3f2518d1 \ No newline at end of file
+e11cc52389f61f6421179281877b119c02286121 \ No newline at end of file
diff --git a/test/incrblobfault.test b/test/incrblobfault.test
index 0c1d93d46..10c2c8ecb 100644
--- a/test/incrblobfault.test
+++ b/test/incrblobfault.test
@@ -52,7 +52,7 @@ do_faultsim_test 2 -prep {
error [sqlite3_errmsg db]
}
} -test {
- faultsim_test_result {1 {no such rowid: -1}}
+ faultsim_test_result {1 {no such rowid: -1}} {1 {disk I/O error}}
close $::blob
}