[ARVADOS] updated: 22db012b60f3501a38ca1b78dc00407f6edd8311

[Git user]

Summary of changes:
 services/keepstore/azure_blob_volume.go      | 2 +-
 services/keepstore/azure_blob_volume_test.go | 3 +--
 services/keepstore/volume_generic_test.go    | 7 +++----
 3 files changed, 5 insertions(+), 7 deletions(-)

       via  22db012b60f3501a38ca1b78dc00407f6edd8311 (commit)
      from  8f792a0826d487a7e0f5825e0937c248b072e61d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 22db012b60f3501a38ca1b78dc00407f6edd8311
Author: radhika <radhika at curoverse.com>
Date:   Fri May 13 17:50:30 2016 -0400

    8556: updated comment

diff --git a/services/keepstore/azure_blob_volume.go b/services/keepstore/azure_blob_volume.go
index c561e03..9e76332 100644
--- a/services/keepstore/azure_blob_volume.go
+++ b/services/keepstore/azure_blob_volume.go
@@ -398,7 +398,7 @@ func (v *AzureBlobVolume) Trash(loc string) error {
 }
 
 // Untrash a Keep block.
-// Delete the expires_at metadata attribute and trash marker
+// Delete the expires_at metadata attribute
 func (v *AzureBlobVolume) Untrash(loc string) error {
 	// if expires_at does not exist, return NotFoundError
 	metadata, err := v.bsClient.GetBlobMetadata(v.containerName, loc)
diff --git a/services/keepstore/azure_blob_volume_test.go b/services/keepstore/azure_blob_volume_test.go
index 4156c4c..af5b283 100644
--- a/services/keepstore/azure_blob_volume_test.go
+++ b/services/keepstore/azure_blob_volume_test.go
@@ -71,11 +71,10 @@ func (h *azStubHandler) TouchWithDate(container, hash string, t time.Time) {
 func (h *azStubHandler) PutRaw(container, hash string, data []byte) {
 	h.Lock()
 	defer h.Unlock()
-	metadata := make(map[string]string)
 	h.blobs[container+"|"+hash] = &azBlob{
 		Data:        data,
 		Mtime:       time.Now(),
-		Metadata:    metadata,
+		Metadata:    make(map[string]string),
 		Uncommitted: make(map[string][]byte),
 	}
 }
diff --git a/services/keepstore/volume_generic_test.go b/services/keepstore/volume_generic_test.go
index 852bc50..44b2b86 100644
--- a/services/keepstore/volume_generic_test.go
+++ b/services/keepstore/volume_generic_test.go
@@ -120,7 +120,7 @@ func testCompareNonexistent(t TB, factory TestableVolumeFactory) {
 	defer v.Teardown()
 
 	err := v.Compare(TestHash, TestBlock)
-	if err == nil || !os.IsNotExist(err) {
+	if err != os.ErrNotExist {
 		t.Errorf("Got err %T %q, expected os.ErrNotExist", err, err)
 	}
 }
@@ -450,12 +450,11 @@ func testDeleteOldBlock(t TB, factory TestableVolumeFactory) {
 		t.Error(err)
 	}
 	data := make([]byte, BlockSize)
-	_, err := v.Get(TestHash, data)
-	if err == nil || !os.IsNotExist(err) {
+	if _, err := v.Get(TestHash, data); err == nil || !os.IsNotExist(err) {
 		t.Errorf("os.IsNotExist(%v) should have been true", err)
 	}
 
-	_, err = v.Mtime(TestHash)
+	_, err := v.Mtime(TestHash)
 	if err == nil {
 		t.Fatalf("os.IsNotExist(%v) should have been true", err)
 	}

-----------------------------------------------------------------------


hooks/post-receive
--