Fix a test case in zipfile.test.

FossilOrigin-Name: 4eb5b24c64ee5907c18371f563b79fa0caf58285a62b8f09e639a690e6727eaa

diff --git a/manifest b/manifest
index 96d387ed832cb7f7ff67f282178374904052d9fe..b6843e249b038a9c9c5a7a065c0509871dfe4f62 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\screating\sa\snew\sarchive\sentry,\shave\szipfile\sstore\sUTC\sinstead\sof\slocal\ntime\sin\sthe\slegacy\sMS-DOS\sformat\stimestamp\sfield.
-D 2018-01-31T19:13:31.142
+C Fix\sa\stest\scase\sin\szipfile.test.
+D 2018-01-31T19:45:58.864
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7a3f714b4fcf793108042b7b0a5c720b0b310ec84314d61ba7f3f49f27e550ea
@@ -1603,7 +1603,7 @@ F test/wordcount.c cb589cec469a1d90add05b1f8cee75c7210338d87a5afd65260ed5c0f4bbf
 F test/writecrash.test f1da7f7adfe8d7f09ea79b42e5ca6dcc41102f27f8e334ad71539501ddd910cc
 F test/zeroblob.test 3857870fe681b8185654414a9bccfde80b62a0fa
 F test/zerodamage.test 9c41628db7e8d9e8a0181e59ea5f189df311a9f6ce99cc376dc461f66db6f8dc
-F test/zipfile.test 3695ab6d731720ca0b542fe21ded39d4a34891f4a590b2e6c909c9ff07e13148
+F test/zipfile.test a16528022b08789168adc9c79646e41fb55c4f94b26a2aca97085ebc591ca84d
 F test/zipfile2.test 5f93611307c131e83f226a471231d769b794b9e8c6a675cfa3d34b1a79df23fe
 F test/zipfilefault.test df4fa9e16116e0cb21d09037a6b0a7d93fecd8767d82154b66044b4ca43fca58
 F tool/GetFile.cs a15e08acb5dd7539b75ba23501581d7c2b462cb5
@@ -1704,10 +1704,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 02ba8a7ba7ba71cd7abd5dd3093ea486f53a025f6972bb444f2da37e0e2fc3b2
-R 4025431a2ff076723fc2f621d10c0c47
-T *branch * zipfile-timestamp-fix
-T *sym-zipfile-timestamp-fix *
-T -sym-trunk *
+P e2114df18383d111dd5fbac902e08b42a7f4b2b2d6f7bf29574a3722e4a4dad5
+R 1aa884bc5be6161439d6cdee8401a11e
 U dan
-Z 7679dfe9f8ef39802f520b9ec5eb4496
+Z 880157cddf7626c80e702257f31b9f96

diff --git a/manifest.uuid b/manifest.uuid
index 555963b3cf58f09e31e665c6e6fa1ff90d6c7d79..91dda60143407310d25ba29ddbedc384dcd5601e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e2114df18383d111dd5fbac902e08b42a7f4b2b2d6f7bf29574a3722e4a4dad5
\ No newline at end of file
+4eb5b24c64ee5907c18371f563b79fa0caf58285a62b8f09e639a690e6727eaa
\ No newline at end of file

diff --git a/test/zipfile.test b/test/zipfile.test
index a6af4f896326dd804229029fa99f7d01b6f33b27..92d8501ea8837e80b78dbc16cd604b4bd36b5edc 100644 (file)
--- a/test/zipfile.test
+++ b/test/zipfile.test
@@ -394,8 +394,9 @@ do_execsql_test 5.0 {
 }
 
 if {[info vars ::UNZIP]!=""} { 
+ifcapable datetime {
   load_static_extension db fileio
-  forcedelete test.zip
+  forcedelete test1.zip test2.zip
   do_test 6.0 {
     execsql {
       WITH c(name,mtime,data) AS (
@@ -403,16 +404,17 @@ if {[info vars ::UNZIP]!=""} {
         SELECT 'b.txt', 1000000000, 'abc' UNION ALL
         SELECT 'c.txt', 1111111000, 'abc'
       )
-      SELECT writefile('test.zip',
-          ( SELECT rt ( zipfile(name,NULL,mtime,data) ) FROM c )
-      );
+      SELECT writefile('test1.zip', rt( zipfile(name, NULL, mtime, data) ) ),
+             writefile('test2.zip',   ( zipfile(name, NULL, mtime, data) ) ) 
+      FROM c;
     }
     forcedelete test_unzip
     file mkdir test_unzip
-    exec unzip -d test_unzip test.zip
+    exec unzip -d test_unzip test1.zip
 
     db eval {
-      SELECT name, mtime FROM fsdir('test_unzip') WHERE name!='test_unzip'
+      SELECT name, strftime('%s', mtime, 'unixepoch', 'localtime') 
+      FROM fsdir('test_unzip') WHERE name!='test_unzip'
       ORDER BY name
     }
   } [list {*}{
@@ -420,6 +422,23 @@ if {[info vars ::UNZIP]!=""} {
     test_unzip/b.txt 1000000000 
     test_unzip/c.txt 1111111000 
   }]
+
+  do_test 6.1 {
+    forcedelete test_unzip
+    file mkdir test_unzip
+    exec unzip -d test_unzip test2.zip
+
+    db eval {
+      SELECT name, mtime 
+      FROM fsdir('test_unzip') WHERE name!='test_unzip'
+      ORDER BY name
+    }
+  } [list {*}{
+    test_unzip/a.txt 946684800
+    test_unzip/b.txt 1000000000 
+    test_unzip/c.txt 1111111000 
+  }]
+}
 }