From: drh <>
Date: Wed, 14 Aug 2024 14:50:22 +0000 (+0000)
Subject: incremental improvements to iotester.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b342a37dbae91c43f14d298f00cf382c0e7ff15;p=thirdparty%2Fsqlite.git

incremental improvements to iotester.

FossilOrigin-Name: 51f5d3d991ba7aa09c3ed319f80624137470b0b7e1f0fe81c6bdaedd99804e1b
---

diff --git a/manifest b/manifest
index 96145d9153..a425b32ccd 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\sincremental\simprovements\sto\sthe\siotester\sprogram.
-D 2024-08-14T14:12:31.366
+C incremental\simprovements\sto\siotester.
+D 2024-08-14T14:50:22.200
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1337,7 +1337,7 @@ F test/ioerr3.test d3cec5e1a11ad6d27527d0d38573fbff14c71bdd
 F test/ioerr4.test f130fe9e71008577b342b8874d52984bd04ede2c
 F test/ioerr5.test 5984da7bf74b6540aa356f2ab0c6ae68a6d12039a3d798a9ac6a100abc17d520
 F test/ioerr6.test a395a6ab144b26a9e3e21059a1ab6a7149cca65b
-F test/iotester.c 2f1e2197506aa661324f40619807fe2c46447e791fa2a33e3062b5074509e2f1
+F test/iotester.c 67239e55a1f48c75b74e24e1e45ea95214394d5560cb148c31485b022dd07324
 F test/istrue.test e7f285bb70282625c258e866ce6337d4c762922f5a300e1b50f958aef6e7d9c9
 F test/join.test f7abfef3faeaf2800308872e33a57e5b6e4a2b44fb8c6b90c6068412e71a6cf4
 F test/join2.test 8561fe82ce434ac96de91544072e578dc2cadddf2d9bc9cd802f866a9b92502e
@@ -2205,8 +2205,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P dd71dde5477a8b3e177ce0255ba0845ece92fa34f4bf23c09e45d2e06f51d3d3
-R aba7335a4c3d685a24835a5758790adb
+P 30a383fc3d49eb50b121446703daa6022af673f08f1347e84f0f10644168eab9
+R 18955a2ff1daa89ee6d9450efd9430d5
 U drh
-Z 6129bd7588ff33b3aa37a3efbdb15a4e
+Z f82775de57e69b49e0adfa10e77e76cc
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 70861ac0e2..f3cf978908 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-30a383fc3d49eb50b121446703daa6022af673f08f1347e84f0f10644168eab9
+51f5d3d991ba7aa09c3ed319f80624137470b0b7e1f0fe81c6bdaedd99804e1b
diff --git a/test/iotester.c b/test/iotester.c
index f7cae140f6..025c3a1cf2 100644
--- a/test/iotester.c
+++ b/test/iotester.c
@@ -975,6 +975,8 @@ static void iotestBasic2(IOTester *p){
   static const char *zDBName = "basic2.db";
   static const char *zExpected1 = 
      "7180714EBF13B8B3D872801D246C5E814227319F091578F8ECA7F51C20A5596E";
+  static const char *zExpected2 =
+     "55C297AAF30A858727C9C132DF0AAD4E1C60286B3C0B3D2D5E6F625CAB32B560";
   p->zTestModule = "basic2";
 
   iotestBeginTest(p, 1);
@@ -1013,6 +1015,7 @@ static void iotestBasic2(IOTester *p){
            "SELECT hex(sha3_agg(b ORDER BY a)) FROM t1");
   if( strcmp(zH1,zExpected1)!=0 ){
     iotestError(p, "expected %s but got %s\n", zExpected1, zH1);
+    goto basic2_exit;
   }
   sqlite3_free(zH1);
   zH1 = 0;
@@ -1022,9 +1025,39 @@ static void iotestBasic2(IOTester *p){
       iotestError(p, "ought not be able to use a secondary database "
                      "connection on \"%s\" while in EXCLUSIVE locking mode\n",
                      zDBName);
+      goto basic2_exit;
     }
   }
 
+  iotestBeginTest(p, 6);
+  iotestRun(p, db, "BEGIN");
+  iotestRun(p, db, "DELETE FROM t1 WHERE ((a/30)&1)==0;");
+  zH1 = iotestQueryText(p, db, "?",
+           "SELECT hex(sha3_agg(b ORDER BY a)) FROM t1");
+  if( strcmp(zH1,zExpected2)!=0 ){
+    iotestError(p, "expected %s but got %s\n", zExpected2, zH1);
+    goto basic2_exit;
+  }
+
+  if( !p->isExclusive && strcmp(p->zJMode,"wa")==0 ){
+    iotestBeginTest(p, 7);
+    zH1 = iotestQueryText(p, db2, "?",
+             "SELECT hex(sha3_agg(b ORDER BY a)) FROM t1");
+    if( strcmp(zH1,zExpected1)!=0 ){
+      iotestError(p, "expected %s but got %s\n", zExpected1, zH1);
+      goto basic2_exit;
+    }
+  }
+
+  iotestBeginTest(p, 8);
+  iotestRun(p, db, "ROLLBACK");
+  zH1 = iotestQueryText(p, db, "?",
+             "SELECT hex(sha3_agg(b ORDER BY a)) FROM t1");
+  if( strcmp(zH1,zExpected1)!=0 ){
+    iotestError(p, "expected %s but got %s\n", zExpected1, zH1);
+    goto basic2_exit;
+  }
+
 basic2_exit:
   sqlite3_close(db);
   sqlite3_close(db2);