X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c447d4a79f653bbf2c172a0a715d30db896a4a32..0c0f18dfbcdcf552889258b76563315fbe2eb060:/services/keepstore/keepstore_test.go?ds=sidebyside

diff --git a/services/keepstore/keepstore_test.go b/services/keepstore/keepstore_test.go
index 7a882e0eec..8a004b73d4 100644
--- a/services/keepstore/keepstore_test.go
+++ b/services/keepstore/keepstore_test.go
@@ -126,8 +126,8 @@ func TestPutBlockOK(t *testing.T) {
 	defer KeepVM.Close()
 
 	// Check that PutBlock stores the data as expected.
-	if err := PutBlock(TestBlock, TestHash); err != nil {
-		t.Fatalf("PutBlock: %v", err)
+	if n, err := PutBlock(TestBlock, TestHash); err != nil || n < 1 {
+		t.Fatalf("PutBlock: n %d err %v", n, err)
 	}
 
 	vols := KeepVM.AllReadable()
@@ -156,8 +156,8 @@ func TestPutBlockOneVol(t *testing.T) {
 	vols[0].(*MockVolume).Bad = true
 
 	// Check that PutBlock stores the data as expected.
-	if err := PutBlock(TestBlock, TestHash); err != nil {
-		t.Fatalf("PutBlock: %v", err)
+	if n, err := PutBlock(TestBlock, TestHash); err != nil || n < 1 {
+		t.Fatalf("PutBlock: n %d err %v", n, err)
 	}
 
 	result, err := GetBlock(TestHash)
@@ -184,8 +184,8 @@ func TestPutBlockMD5Fail(t *testing.T) {
 
 	// Check that PutBlock returns the expected error when the hash does
 	// not match the block.
-	if err := PutBlock(BadBlock, TestHash); err != RequestHashError {
-		t.Error("Expected RequestHashError, got %v", err)
+	if _, err := PutBlock(BadBlock, TestHash); err != RequestHashError {
+		t.Errorf("Expected RequestHashError, got %v", err)
 	}
 
 	// Confirm that GetBlock fails to return anything.
@@ -209,8 +209,8 @@ func TestPutBlockCorrupt(t *testing.T) {
 	// Store a corrupted block under TestHash.
 	vols := KeepVM.AllWritable()
 	vols[0].Put(TestHash, BadBlock)
-	if err := PutBlock(TestBlock, TestHash); err != nil {
-		t.Errorf("PutBlock: %v", err)
+	if n, err := PutBlock(TestBlock, TestHash); err != nil || n < 1 {
+		t.Errorf("PutBlock: n %d err %v", n, err)
 	}
 
 	// The block on disk should now match TestBlock.
@@ -239,10 +239,10 @@ func TestPutBlockCollision(t *testing.T) {
 
 	// Store one block, then attempt to store the other. Confirm that
 	// PutBlock reported a CollisionError.
-	if err := PutBlock(b1, locator); err != nil {
+	if _, err := PutBlock(b1, locator); err != nil {
 		t.Error(err)
 	}
-	if err := PutBlock(b2, locator); err == nil {
+	if _, err := PutBlock(b2, locator); err == nil {
 		t.Error("PutBlock did not report a collision")
 	} else if err != CollisionError {
 		t.Errorf("PutBlock returned %v", err)
@@ -273,8 +273,8 @@ func TestPutBlockTouchFails(t *testing.T) {
 	// vols[0].Touch will fail on the next call, so the volume
 	// manager will store a copy on vols[1] instead.
 	vols[0].(*MockVolume).Touchable = false
-	if err := PutBlock(TestBlock, TestHash); err != nil {
-		t.Fatalf("PutBlock: %v", err)
+	if n, err := PutBlock(TestBlock, TestHash); err != nil || n < 1 {
+		t.Fatalf("PutBlock: n %d err %v", n, err)
 	}
 	vols[0].(*MockVolume).Touchable = true
 
@@ -333,8 +333,8 @@ func TestDiscoverTmpfs(t *testing.T) {
 	f.Close()
 	ProcMounts = f.Name()
 
-	var resultVols volumeSet
-	added := resultVols.Discover()
+	resultVols := volumeSet{}
+	added := (&unixVolumeAdder{&resultVols}).Discover()
 
 	if added != len(resultVols) {
 		t.Errorf("Discover returned %d, but added %d volumes",
@@ -373,8 +373,8 @@ func TestDiscoverNone(t *testing.T) {
 	f.Close()
 	ProcMounts = f.Name()
 
-	var resultVols volumeSet
-	added := resultVols.Discover()
+	resultVols := volumeSet{}
+	added := (&unixVolumeAdder{&resultVols}).Discover()
 	if added != 0 || len(resultVols) != 0 {
 		t.Fatalf("got %d, %v; expected 0, []", added, resultVols)
 	}
@@ -418,44 +418,6 @@ func TestIndex(t *testing.T) {
 	}
 }
 
-// TestKeepStoreGetEmptyBlock
-func TestKeepStoreGetEmptyBlock(t *testing.T) {
-	defer teardown()
-
-	// Prepare two mock volumes
-	KeepVM = MakeTestVolumeManager(2)
-	defer KeepVM.Close()
-
-	vols := KeepVM.AllWritable()
-	if err := vols[0].Put(EmptyHash, EmptyBlock); err != nil {
-		t.Error("Error putting empty block: %s", err)
-	}
-
-	// Check that GetBlock returns success.
-	result, err := GetBlock(EmptyHash)
-	if err != nil {
-		t.Errorf("Get error for empty hash: %s", err)
-	}
-	if bytes.Compare(result, EmptyBlock) != 0 {
-		t.Errorf("Get response incorrect. Expected %q; found %q", EmptyBlock, result)
-	}
-}
-
-// TestKeepStoreGetEmptyBlockNotExists that does not exist
-func TestKeepStoreGetEmptyBlockNotExists(t *testing.T) {
-	defer teardown()
-
-	// Prepare two mock volumes
-	KeepVM = MakeTestVolumeManager(2)
-	defer KeepVM.Close()
-
-	// Check that GetBlock returns error.
-	_, err := GetBlock(EmptyHash)
-	if err == nil {
-		t.Errorf("Expected error when getting non-existing empty block")
-	}
-}
-
 // ========================================
 // Helper functions for unit tests.
 // ========================================