Added TestPutBlockOneVol and TestPutBlockCorrupt. (refs #2292, refs #2449)

[arvados.git] / services / keep / keep_test.go

diff --git a/services/keep/keep_test.go b/services/keep/keep_test.go
index 4795dadb9f767fa3eb993c6a084be6b6261ae00e..81907e37492aae105f045bef1739604acc1bb922 100644 (file)
--- a/services/keep/keep_test.go
+++ b/services/keep/keep_test.go
@@ -100,19 +100,35 @@ func TestPutBlockOK(t *testing.T) {
        KeepVolumes = setup(t, 2)
 
        // Check that PutBlock stores the data as expected.
-       err := PutBlock(TEST_BLOCK, TEST_HASH)
-       if err == nil {
-               t.Log("err is nil")
+       if err := PutBlock(TEST_BLOCK, TEST_HASH); err != nil {
+               t.Fatalf("PutBlock: %v", err)
        }
+
+       result, err := GetBlock(TEST_HASH)
        if err != nil {
-               t.Fatalf("PutBlock: %v", err)
+               t.Fatalf("GetBlock: %s", err.Error())
        }
+       if string(result) != string(TEST_BLOCK) {
+               t.Error("PutBlock/GetBlock mismatch")
+               t.Fatalf("PutBlock stored '%s', GetBlock retrieved '%s'",
+                       string(TEST_BLOCK), string(result))
+       }
+}
+
+// Test storing a block when only one volume (of many) is not available.
+func TestPutBlockOneVol(t *testing.T) {
+       defer teardown()
 
-       var result []byte
-       result, err = GetBlock(TEST_HASH)
-       t.Log("result = %v", result)
-       t.Log("err = %v", err)
+       // Create two test Keep volumes, but cripple one of them.
+       KeepVolumes = setup(t, 2)
+       os.Chmod(KeepVolumes[0], 000)
 
+       // Check that PutBlock stores the data as expected.
+       if err := PutBlock(TEST_BLOCK, TEST_HASH); err != nil {
+               t.Fatalf("PutBlock: %v", err)
+       }
+
+       result, err := GetBlock(TEST_HASH)
        if err != nil {
                t.Fatalf("GetBlock: %s", err.Error())
        }
@@ -123,6 +139,34 @@ func TestPutBlockOK(t *testing.T) {
        }
 }
 
+// TestPutBlockCorrupt
+//     Check that PutBlock returns an error if passed a block and hash that
+//     do not match.
+//
+func TestPutBlockCorrupt(t *testing.T) {
+       defer teardown()
+
+       // Create two test Keep volumes.
+       KeepVolumes = setup(t, 2)
+
+       // Check that PutBlock returns the expected error when the hash does
+       // not match the block.
+       if err := PutBlock(BAD_BLOCK, TEST_HASH); err == nil {
+               t.Error("PutBlock succeeded despite a block mismatch")
+       } else {
+               ke := err.(*KeepError)
+               if ke.HTTPCode != 401 || ke.Err.Error() != "MD5Fail" {
+                       t.Errorf("PutBlock returned the wrong error (%v)", ke)
+               }
+       }
+
+       // Confirm that GetBlock fails to return anything.
+       if result, err := GetBlock(TEST_HASH); err == nil {
+               t.Errorf("GetBlock succeded after a corrupt block store, returned '%s'",
+                       string(result))
+       }
+}
+
 // Test finding Keep volumes.
 func TestFindKeepVolumes(t *testing.T) {
        defer teardown()