MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-11 15:03:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

tests: Fix hasExtendedHeader tests with env variable.

Browse Source
This commit is contained in:
Harshavardhana 2016-08-15 16:09:08 -07:00
parent bb8a425d49
commit 3d1bb8f439
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs-v1-metadata_test.go
View File

@ -16,7 +16,10 @@
package main
import "testing"
import (
"os"
"testing"
)
// Tests scenarios which can occur for hasExtendedHeader function.
func TestHasExtendedHeader(t *testing.T) {
@ -30,26 +33,26 @@ func TestHasExtendedHeader(t *testing.T) {
metadata: map[string]string{
"X-Amz-Meta-1": "value",
},
has: true,
has: true || os.Getenv("MINIO_ENABLE_FSMETA") == "1",
},
// Verifies if X-Minio-Meta is present.
{
metadata: map[string]string{
"X-Minio-Meta-1": "value",
},
has: true,
has: true || os.Getenv("MINIO_ENABLE_FSMETA") == "1",
},
// Verifies if extended header is not present.
{
metadata: map[string]string{
"md5Sum": "value",
},
has: false,
has: false || os.Getenv("MINIO_ENABLE_FSMETA") == "1",
},
// Verifieis if extended header is not present, but with an empty input.
// Verifies if extended header is not present, but with an empty input.
{
metadata: nil,
has: false,
has: false || os.Getenv("MINIO_ENABLE_FSMETA") == "1",
},
}

3
fs-v1-multipart.go
View File

@ -587,6 +587,9 @@ func (fs fsObjects) CompleteMultipartUpload(bucket string, object string, upload
// Save additional metadata only if extended headers such as "X-Amz-Meta-" are set.
if hasExtendedHeader(fsMeta.Meta) {
if len(fsMeta.Meta) == 0 {
fsMeta.Meta = make(map[string]string)
}
fsMeta.Meta["md5Sum"] = s3MD5
// Write the metadata to a temp file and rename it to the actual location.