1. docker
  2. Commit 05cbe23db9836476677e7071d21ad53bf93dc2e7
Browse code

pkg/tarsum: fix unit test for Go 1.11+

Since go-1.11beta1 archive/tar, tar headers with Typeflag == TypeRegA
(numeric 0) (which is the default unless explicitly initialized) are
modified to have Typeflag set to either tar.TypeReg (character value
'0', not numeric 0) or tar.TypeDir (character value '5') [1].
This results in different Typeflag value in the resulting header,
leading to a different Checksum, and causing the following test
case errors:

> 12:09:14 --- FAIL: TestTarSums (0.05s)
> 12:09:14 tarsum_test.go:393: expecting
> [tarsum+sha256:8bf12d7e67c51ee2e8306cba569398b1b9f419969521a12ffb9d8875e8836738],
> but got
> [tarsum+sha256:75258b2c5dcd9adfe24ce71eeca5fc5019c7e669912f15703ede92b1a60cb11f]
> ... (etc.)

All the other code explicitly sets the Typeflag field, but this test
case is not, causing the incompatibility with Go 1.11. Therefore,
the fix is to set TypeReg explicitly, and change the expected checksums
in test cases).

Alternatively, we can vendor archive/tar again (for the 100th time),
but given that the issue is limited to the particular test case it
does not make sense.

This fixes the test for all Go versions.

[1] https://go-review.googlesource.com/c/go/+/85656

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

Kir Kolyshkin authored on 2018/07/11 22:28:39
Showing 1 changed files
pkg/tarsum/tarsum_test.go
History View file @ 05cbe23
... ... 
@@ -65,7 +65,7 @@ var testLayers = []testLayer{
65 65 
 		tarsum:   "tarsum+sha256:c66bd5ec9f87b8f4c6135ca37684618f486a3dd1d113b138d0a177bfa39c2571"},
66 66 
 	{
67 67 
 		options: &sizedOptions{1, 1024 * 1024, false, false}, // a 1mb file (in memory)
68 
-		tarsum:  "tarsum+sha256:8bf12d7e67c51ee2e8306cba569398b1b9f419969521a12ffb9d8875e8836738"},
68 
+		tarsum:  "tarsum+sha256:75258b2c5dcd9adfe24ce71eeca5fc5019c7e669912f15703ede92b1a60cb11f"},
69 69 
 	{
70 70 
 		// this tar has two files with the same path
71 71 
 		filename: "testdata/collision/collision-0.tar",
... ... 
@@ -84,27 +84,27 @@ var testLayers = []testLayer{
84 84 
 		tarsum:   "tarsum+sha256:cbe4dee79fe979d69c16c2bccd032e3205716a562f4a3c1ca1cbeed7b256eb19"},
85 85 
 	{
86 86 
 		options: &sizedOptions{1, 1024 * 1024, false, false}, // a 1mb file (in memory)
87 
-		tarsum:  "tarsum+md5:0d7529ec7a8360155b48134b8e599f53",
87 
+		tarsum:  "tarsum+md5:3a6cdb475d90459ac0d3280703d17be2",
88 88 
 		hash:    md5THash,
89 89 
 	},
90 90 
 	{
91 91 
 		options: &sizedOptions{1, 1024 * 1024, false, false}, // a 1mb file (in memory)
92 
-		tarsum:  "tarsum+sha1:f1fee39c5925807ff75ef1925e7a23be444ba4df",
92 
+		tarsum:  "tarsum+sha1:14b5e0d12a0c50a4281e86e92153fa06d55d00c6",
93 93 
 		hash:    sha1Hash,
94 94 
 	},
95 95 
 	{
96 96 
 		options: &sizedOptions{1, 1024 * 1024, false, false}, // a 1mb file (in memory)
97 
-		tarsum:  "tarsum+sha224:6319390c0b061d639085d8748b14cd55f697cf9313805218b21cf61c",
97 
+		tarsum:  "tarsum+sha224:dd8925b7a4c71b13f3a68a0f9428a757c76b93752c398f272a9062d5",
98 98 
 		hash:    sha224Hash,
99 99 
 	},
100 100 
 	{
101 101 
 		options: &sizedOptions{1, 1024 * 1024, false, false}, // a 1mb file (in memory)
102 
-		tarsum:  "tarsum+sha384:a578ce3ce29a2ae03b8ed7c26f47d0f75b4fc849557c62454be4b5ffd66ba021e713b48ce71e947b43aab57afd5a7636",
102 
+		tarsum:  "tarsum+sha384:e39e82f40005134bed13fb632d1a5f2aa4675c9ddb4a136fbcec202797e68d2f635e1200dee2e3a8d7f69d54d3f2fd27",
103 103 
 		hash:    sha384Hash,
104 104 
 	},
105 105 
 	{
106 106 
 		options: &sizedOptions{1, 1024 * 1024, false, false}, // a 1mb file (in memory)
107 
-		tarsum:  "tarsum+sha512:e9bfb90ca5a4dfc93c46ee061a5cf9837de6d2fdf82544d6460d3147290aecfabf7b5e415b9b6e72db9b8941f149d5d69fb17a394cbfaf2eac523bd9eae21855",
107 
+		tarsum:  "tarsum+sha512:7c56de40b2d1ed3863ff25d83b59cdc8f53e67d1c01c3ee8f201f8e4dec3107da976d0c0ec9109c962a152b32699fe329b2dab13966020e400c32878a0761a7e",
108 108 
 		hash:    sha512Hash,
109 109 
 	},
110 110 
 }
... ... 
@@ -138,11 +138,12 @@ func sizedTar(opts sizedOptions) io.Reader {
138 138 
 	defer tarW.Close()
139 139 
 	for i := int64(0); i < opts.num; i++ {
140 140 
 		err := tarW.WriteHeader(&tar.Header{
141 
-			Name: fmt.Sprintf("/testdata%d", i),
142 
-			Mode: 0755,
143 
-			Uid:  0,
144 
-			Gid:  0,
145 
-			Size: opts.size,
141 
+			Name:     fmt.Sprintf("/testdata%d", i),
142 
+			Mode:     0755,
143 
+			Uid:      0,
144 
+			Gid:      0,
145 
+			Size:     opts.size,
146 
+			Typeflag: tar.TypeReg,
146 147 
 		})
147 148 
 		if err != nil {
148 149 
 			return nil