Adjustments to test numbers for the 'zonefile' extension.

FossilOrigin-Name: 55de6f14d49342394397c0dc29c1e98c927ef99d57ec1f71c79099f584be20d1

diff --git a/ext/zonefile/zonefile1.test b/ext/zonefile/zonefile1.test
index 269b88d8b9f400fa206d1302ca8c15ed6c3afa3c..3e870810cff369fe847c96e2c922b51256c23028 100644 (file)
--- a/ext/zonefile/zonefile1.test
+++ b/ext/zonefile/zonefile1.test
@@ -384,7 +384,7 @@ do_catchsql_test 6.4 {
   INSERT INTO zzz_files(filename) VALUES('nosuchfile.zonefile');
 } {1 {failed to open file "nosuchfile.zonefile" for reading}}
 
-do_catchsql_test 6.4 {
+do_catchsql_test 6.5 {
   INSERT INTO zzz_files(filename) VALUES('test.dir');
 } {1 {failed to read zonefile header from file "test.dir"}}
 
@@ -547,7 +547,7 @@ do_catchsql_test 12.3 {
 #
 reset_db
 load_static_extension db zonefile
-do_execsql_test 11.0 {
+do_execsql_test 13.0 {
   CREATE TABLE data(k INTEGER PRIMARY KEY, v BLOB);
   WITH s(i) AS (
     SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<250
@@ -569,37 +569,37 @@ foreach {tn cond} {
   6   "k BETWEEN 10 AND 20"
   7   "k > 100 AND k < 200"
 } {
-  do_execsql_test 11.1.$tn.1 [subst {
+  do_execsql_test 13.1.$tn.1 [subst {
     SELECT count(*) FROM nm WHERE $cond
   }] [db one "SELECT count(*) FROM data WHERE $cond"]
 
-  do_execsql_test 11.1.$tn.2 [subst {
+  do_execsql_test 13.1.$tn.2 [subst {
     SELECT count(*) FROM nm WHERE $cond AND
       v!=(SELECT v FROM data WHERE k=nm.k);
   }] 0
 }
 
 close [open test1.zonefile w+]
-do_catchsql_test 11.2.1 {
+do_catchsql_test 13.2.1 {
   SELECT * FROM nm WHERE k=24;
 } {1 {SQL logic error}}
 forcedelete test1.zonefile
-do_catchsql_test 11.2.2 {
+do_catchsql_test 13.2.2 {
   SELECT * FROM nm WHERE k=24;
 } {1 {failed to open file "test1.zonefile" for reading}}
 
-do_catchsql_test 11.3.1 {
+do_catchsql_test 13.3.1 {
   DELETE FROM nm_shadow_file;
   SELECT * FROM nm WHERE k=24;
 } {1 {database disk image is malformed}}
-do_catchsql_test 11.3.2 {
+do_catchsql_test 13.3.2 {
   DROP TABLE nm_shadow_file;
   SELECT * FROM nm WHERE k=24;
 } {1 {no such table: main.nm_shadow_file}}
 db close
 sqlite3 db test.db
 load_static_extension db zonefile
-do_catchsql_test 11.3.3 {
+do_catchsql_test 13.3.3 {
   SELECT * FROM nm WHERE k=24;
 } {1 {no such table: main.nm_shadow_file}}
 
@@ -607,7 +607,7 @@ do_catchsql_test 11.3.3 {
 #
 reset_db
 load_static_extension db zonefile
-do_execsql_test 11.0 {
+do_execsql_test 14.0 {
   CREATE TABLE data(k INTEGER PRIMARY KEY, frame, idx, v BLOB);
   INSERT INTO data VALUES(1, 1, -1, randomblob(200));
   INSERT INTO data VALUES(2, 2, -1, randomblob(200));
@@ -622,14 +622,14 @@ do_execsql_test 11.0 {
 
 set i 0
 foreach id {1 2 3 2 3 1} {
-  do_execsql_test 11.1.$i {
+  do_execsql_test 14.1.$i {
     SELECT data.v=nm.v FROM data,nm WHERE data.k=$id AND nm.k=$id
   } 1
   incr i
 }
 
 if {[file exists /dev/null]} {
-  do_catchsql_test 11.2 {
+  do_catchsql_test 14.2 {
     INSERT INTO nm_files(filename) VALUES('/dev/null');
   } {1 {failed to read zonefile header from file "/dev/null"}}
 }

diff --git a/ext/zonefile/zonefileenc.test b/ext/zonefile/zonefileenc.test
index 1f912cad1ffa1781468525b85c56897a6ecc7ee5..64d6fefdac8bd8d51062ddb8db087f7f9044f5d9 100644 (file)
--- a/ext/zonefile/zonefileenc.test
+++ b/ext/zonefile/zonefileenc.test
@@ -12,6 +12,8 @@
 # The focus of this file is testing the zonefile extension.
 #
 
+package require Tcl 8.6
+
 if {![info exists testdir]} {
   set testdir [file join [file dirname [info script]] .. .. test]
 }
@@ -177,7 +179,7 @@ foreach {tn alg id} {
 foreach {tn alg} {
   1 nosuchmethod! 
 } {
-  do_catchsql_test 2.1.$tn {
+  do_catchsql_test 2.2.$tn {
     WITH p(n,v) AS (
         VALUES('encryptionType', $alg) UNION ALL
         VALUES('debugEncryptionKeyText', 1) UNION ALL

diff --git a/ext/zonefile/zonefilefault.test b/ext/zonefile/zonefilefault.test
index fafdf73e2f0076a45f2f8f1d0ebf78242baef187..5768f12239d8ee86856538e7d848de2ddc47686b 100644 (file)
--- a/ext/zonefile/zonefilefault.test
+++ b/ext/zonefile/zonefilefault.test
@@ -239,7 +239,7 @@ do_faultsim_test 4.3 -faults oom* -prep {
 
 #-------------------------------------------------------------------------
 reset_db
-do_faultsim_test 4.3 -faults oom* -prep {
+do_faultsim_test 4.4 -faults oom* -prep {
   faultsim_restore_and_reopen
 } -body {
   load_static_extension db zonefile

diff --git a/manifest b/manifest
index cdeaf7f224dbfaac7a34201be7b2d09cedff7e0f..5fd6887b6c0d2b5567eeb063140e72108bbba678 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Have\sthe\szonefile\sextension\suse\sbinary\sinstead\sof\stext\skeys.
-D 2018-02-27T14:26:33.798
+C Adjustments\sto\stest\snumbers\sfor\sthe\s'zonefile'\sextension.
+D 2018-02-27T15:42:29.507
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in a2d2fb8d17c39ab5ec52beb27850b903949080848236923f436156b72a958737
@@ -410,9 +410,9 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 3410be31283abba70255d71fd24734e017a4497f
 F ext/zonefile/README.md 5beb84b8f8326d23319003d57d88be88759fdc3296071a2c5f13c0209703738a
 F ext/zonefile/zonefile.c b83136e629c6768e9ff06bb37ae7d102b5b267f8ff5d9481bd65dc87d7f2d483
-F ext/zonefile/zonefile1.test 57170e948447868c19786afe9e55e0c65a2c9c69b7e3b27dc508f17ab6fc9202
-F ext/zonefile/zonefileenc.test 7bc183b3ebbb6fca761cdc93df5a9686e67fda0632d3e9cf1372188ad418108a
-F ext/zonefile/zonefilefault.test 1574e70ad816982f27d6f51da32a133f62064d56a668c0d00189d17defb4f0ad
+F ext/zonefile/zonefile1.test e10670c41d82299fbf300004cb7c557c0d42a62cbdb0b1e13ee4d4dd901a6726
+F ext/zonefile/zonefileenc.test e8624853ac224bfdeab8d2a231796499c3032e2a8bb1d2208f52fddf9507e38f
+F ext/zonefile/zonefilefault.test 6df281fc1ec7859d4ae2a3133d8783184a263edf6d081218958b6ae86b22ee13
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -1712,7 +1712,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 231832c4cb15862e61dfcc00fba9ab78ca7e2442a0d4aa1a98a191f5f8b4cff3
-R cf22e181dbe1916f9e1eef490351edef
-U dan
-Z 5f06773d3ebf0b974cf6c0e07502aa1f
+P 39a4267fc9cec77fd8d9be25c73b848e77a68906253cc75d61fe90e549bafa27
+R 6631ad1e9a6da71e129b866cc5249dc9
+U mistachkin
+Z 7bdde0999bac4dc25ee12cad1b2341f4

diff --git a/manifest.uuid b/manifest.uuid
index a92c92040096a830579b8d8b3876df348ccac928..a54d75231bc9c1ca3c699bc92167051b1d523ab0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-39a4267fc9cec77fd8d9be25c73b848e77a68906253cc75d61fe90e549bafa27
\ No newline at end of file
+55de6f14d49342394397c0dc29c1e98c927ef99d57ec1f71c79099f584be20d1
\ No newline at end of file