From 1148f95292d618db4a7777cdbba94cf3bb0b5816 Mon Sep 17 00:00:00 2001 From: Karthic Rao Date: Thu, 22 Sep 2016 11:33:54 +0530 Subject: [PATCH] ineffassign fixes (#2758) --- cmd/fs-v1-multipart-common_test.go | 10 +++++++++- cmd/fs-v1_test.go | 8 ++++++++ cmd/server_test.go | 2 ++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/cmd/fs-v1-multipart-common_test.go b/cmd/fs-v1-multipart-common_test.go index c18990bc8..ab6c8e325 100644 --- a/cmd/fs-v1-multipart-common_test.go +++ b/cmd/fs-v1-multipart-common_test.go @@ -71,12 +71,16 @@ func TestFSIsUploadExists(t *testing.T) { fs := obj.(fsObjects) + var uploadID string bucketName := "bucket" objectName := "object" obj.MakeBucket(bucketName) - uploadID, err := obj.NewMultipartUpload(bucketName, objectName, nil) + uploadID, err = obj.NewMultipartUpload(bucketName, objectName, nil) + if err != nil { + t.Fatal("Cannot create a new FS object: ", err) + } // Test with valid upload id if exists := fs.isUploadIDExists(bucketName, objectName, uploadID); !exists { t.Fatal("Wrong result, expected: ", exists) @@ -118,6 +122,10 @@ func TestFSWriteUploadJSON(t *testing.T) { obj.MakeBucket(bucketName) uploadID, err := obj.NewMultipartUpload(bucketName, objectName, nil) + if err != nil { + t.Fatal("Unexpected err: ", err) + } + if err := fs.writeUploadJSON(bucketName, objectName, uploadID, time.Now().UTC()); err != nil { t.Fatal("Unexpected err: ", err) } diff --git a/cmd/fs-v1_test.go b/cmd/fs-v1_test.go index ca604aa7a..af5850858 100644 --- a/cmd/fs-v1_test.go +++ b/cmd/fs-v1_test.go @@ -108,6 +108,10 @@ func TestFSLoadFormatFS(t *testing.T) { defer removeAll(disk) obj, err := newFSObjects(disk) + if err != nil { + t.Fatal("Should not fail here", err) + } + fs := obj.(fsObjects) // Regular format loading @@ -137,6 +141,10 @@ func TestFSGetBucketInfo(t *testing.T) { defer removeAll(disk) obj, err := newFSObjects(disk) + if err != nil { + t.Fatal(err) + } + fs := obj.(fsObjects) bucketName := "bucket" diff --git a/cmd/server_test.go b/cmd/server_test.go index 72a8fe46d..185c7dfa8 100644 --- a/cmd/server_test.go +++ b/cmd/server_test.go @@ -1463,6 +1463,8 @@ func (s *TestSuiteCommon) TestListObjectsHandler(c *C) { c.Assert(response.StatusCode, Equals, http.StatusOK) getContent, err = ioutil.ReadAll(response.Body) + c.Assert(err, IsNil) + c.Assert(strings.Contains(string(getContent), "bar"), Equals, true) c.Assert(strings.Contains(string(getContent), "miniominio"), Equals, true)