diff options
| author | Yasuhiro Matsumoto <mattn.jp@gmail.com> | 2016-01-06 21:36:31 +0900 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2016-10-06 19:05:52 +0000 |
| commit | 4c79ed5f4483f1de065ba2b409de58ae2b6907d2 (patch) | |
| tree | e4d5ef8bd3c7a4304406f935885f79e82a64a0f4 /src/archive/zip/reader_test.go | |
| parent | 122abe6b122a885c52a53044eedbd3b6905b6124 (diff) | |
| download | go-4c79ed5f4483f1de065ba2b409de58ae2b6907d2.tar.gz go-4c79ed5f4483f1de065ba2b409de58ae2b6907d2.zip | |
archive/zip: handle mtime in NTFS/UNIX/ExtendedTS extra fields
Handle NTFS timestamp, UNIX timestamp, Extended extra timestamp.
Writer supports only Extended extra timestamp field, matching most
zip creators.
Fixes #10242.
Change-Id: Id665db274e63def98659231391fb77392267ac1e
Reviewed-on: https://go-review.googlesource.com/18274
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>
Diffstat (limited to 'src/archive/zip/reader_test.go')
| -rw-r--r-- | src/archive/zip/reader_test.go | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/src/archive/zip/reader_test.go b/src/archive/zip/reader_test.go index dfaae78436..576a1697a4 100644 --- a/src/archive/zip/reader_test.go +++ b/src/archive/zip/reader_test.go @@ -65,13 +65,13 @@ var tests = []ZipTest{ { Name: "test.txt", Content: []byte("This is a test text file.\n"), - Mtime: "09-05-10 12:12:02", + Mtime: "09-05-10 02:12:00", Mode: 0644, }, { Name: "gophercolor16x16.png", File: "gophercolor16x16.png", - Mtime: "09-05-10 15:52:58", + Mtime: "09-05-10 05:52:58", Mode: 0644, }, }, @@ -83,13 +83,13 @@ var tests = []ZipTest{ { Name: "test.txt", Content: []byte("This is a test text file.\n"), - Mtime: "09-05-10 12:12:02", + Mtime: "09-05-10 02:12:00", Mode: 0644, }, { Name: "gophercolor16x16.png", File: "gophercolor16x16.png", - Mtime: "09-05-10 15:52:58", + Mtime: "09-05-10 05:52:58", Mode: 0644, }, }, @@ -145,6 +145,17 @@ var tests = []ZipTest{ File: crossPlatform, }, { + Name: "extra-timestamp.zip", + File: []ZipTestFile{ + { + Name: "hello.txt", + Content: []byte(""), + Mtime: "01-06-16 12:25:56", + Mode: 0666, + }, + }, + }, + { // created by Go, before we wrote the "optional" data // descriptor signatures (which are required by OS X) Name: "go-no-datadesc-sig.zip", @@ -152,13 +163,13 @@ var tests = []ZipTest{ { Name: "foo.txt", Content: []byte("foo\n"), - Mtime: "03-08-12 16:59:10", + Mtime: "03-09-12 00:59:10", Mode: 0644, }, { Name: "bar.txt", Content: []byte("bar\n"), - Mtime: "03-08-12 16:59:12", + Mtime: "03-09-12 00:59:12", Mode: 0644, }, }, @@ -205,13 +216,13 @@ var tests = []ZipTest{ { Name: "foo.txt", Content: []byte("foo\n"), - Mtime: "03-08-12 16:59:10", + Mtime: "03-09-12 00:59:10", Mode: 0644, }, { Name: "bar.txt", Content: []byte("bar\n"), - Mtime: "03-08-12 16:59:12", + Mtime: "03-09-12 00:59:12", Mode: 0644, }, }, @@ -225,14 +236,14 @@ var tests = []ZipTest{ { Name: "foo.txt", Content: []byte("foo\n"), - Mtime: "03-08-12 16:59:10", + Mtime: "03-09-12 00:59:10", Mode: 0644, ContentErr: ErrChecksum, }, { Name: "bar.txt", Content: []byte("bar\n"), - Mtime: "03-08-12 16:59:12", + Mtime: "03-09-12 00:59:12", Mode: 0644, }, }, |