Skip to content

Commit 474b326

Browse files
change checksums to match what is read() (#1709)
1 parent 8257e70 commit 474b326

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

functional_tests.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -2054,10 +2054,10 @@ func testPutObjectWithChecksums() {
20542054
ChecksumSHA1 string
20552055
ChecksumSHA256 string
20562056
}{
2057-
{header: "x-amz-checksum-crc32", hasher: crc32.NewIEEE(), ChecksumCRC32: "yXTVFQ=="},
2058-
{header: "x-amz-checksum-crc32c", hasher: crc32.New(crc32.MakeTable(crc32.Castagnoli)), ChecksumCRC32C: "zXqj7Q=="},
2059-
{header: "x-amz-checksum-sha1", hasher: sha1.New(), ChecksumSHA1: "SwmAs3F75Sw/sE4dHehkvYtn9UE="},
2060-
{header: "x-amz-checksum-sha256", hasher: sha256.New(), ChecksumSHA256: "8Tlu9msuw/cpmWNEnQx97axliBjiE6gK1doiY0N9WuA="},
2057+
{header: "x-amz-checksum-crc32", hasher: crc32.NewIEEE()},
2058+
{header: "x-amz-checksum-crc32c", hasher: crc32.New(crc32.MakeTable(crc32.Castagnoli))},
2059+
{header: "x-amz-checksum-sha1", hasher: sha1.New()},
2060+
{header: "x-amz-checksum-sha256", hasher: sha256.New()},
20612061
}
20622062

20632063
for i, test := range tests {
@@ -2113,10 +2113,10 @@ func testPutObjectWithChecksums() {
21132113
logError(testName, function, args, startTime, "", "PutObject failed", err)
21142114
return
21152115
}
2116-
cmpChecksum(resp.ChecksumSHA256, test.ChecksumSHA256)
2117-
cmpChecksum(resp.ChecksumSHA1, test.ChecksumSHA1)
2118-
cmpChecksum(resp.ChecksumCRC32, test.ChecksumCRC32)
2119-
cmpChecksum(resp.ChecksumCRC32C, test.ChecksumCRC32C)
2116+
cmpChecksum(resp.ChecksumSHA256, meta["x-amz-checksum-sha256"])
2117+
cmpChecksum(resp.ChecksumSHA1, meta["x-amz-checksum-sha1"])
2118+
cmpChecksum(resp.ChecksumCRC32, meta["x-amz-checksum-crc32"])
2119+
cmpChecksum(resp.ChecksumCRC32C, meta["x-amz-checksum-crc32c"])
21202120

21212121
// Read the data back
21222122
gopts := minio.GetObjectOptions{Checksum: true}
@@ -2132,10 +2132,10 @@ func testPutObjectWithChecksums() {
21322132
return
21332133
}
21342134

2135-
cmpChecksum(st.ChecksumSHA256, test.ChecksumSHA256)
2136-
cmpChecksum(st.ChecksumSHA1, test.ChecksumSHA1)
2137-
cmpChecksum(st.ChecksumCRC32, test.ChecksumCRC32)
2138-
cmpChecksum(st.ChecksumCRC32C, test.ChecksumCRC32C)
2135+
cmpChecksum(st.ChecksumSHA256, meta["x-amz-checksum-sha256"])
2136+
cmpChecksum(st.ChecksumSHA1, meta["x-amz-checksum-sha1"])
2137+
cmpChecksum(st.ChecksumCRC32, meta["x-amz-checksum-crc32"])
2138+
cmpChecksum(st.ChecksumCRC32C, meta["x-amz-checksum-crc32c"])
21392139

21402140
if st.Size != int64(bufSize) {
21412141
logError(testName, function, args, startTime, "", "Number of bytes returned by PutObject does not match GetObject, expected "+string(bufSize)+" got "+string(st.Size), err)

0 commit comments

Comments
 (0)