X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/67f730557e062608f842fa3abc612fb717fbce2f..e9a7e33f90106db0d36d8d45f1929483662c7168:/services/keepstore/volume_generic_test.go

diff --git a/services/keepstore/volume_generic_test.go b/services/keepstore/volume_generic_test.go
index c08c3f5f00..6dca74eaf2 100644
--- a/services/keepstore/volume_generic_test.go
+++ b/services/keepstore/volume_generic_test.go
@@ -70,7 +70,7 @@ func testGet(t *testing.T, factory TestableVolumeFactory) {
 
 	buf, err := v.Get(TestHash)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	bufs.Put(buf)
@@ -182,14 +182,14 @@ func testPutBlockWithDifferentContent(t *testing.T, factory TestableVolumeFactor
 		// Put must not return a nil error unless it has
 		// overwritten the existing data.
 		if bytes.Compare(buf, testDataB) != 0 {
-			t.Errorf("Put succeeded but Get returned %+v, expected %+v", buf, testDataB)
+			t.Errorf("Put succeeded but Get returned %+q, expected %+q", buf, testDataB)
 		}
 	} else {
 		// It is permissible for Put to fail, but it must
 		// leave us with either the original data, the new
 		// data, or nothing at all.
 		if getErr == nil && bytes.Compare(buf, testDataA) != 0 && bytes.Compare(buf, testDataB) != 0 {
-			t.Errorf("Put failed but Get returned %+v, which is neither %+v nor %+v", buf, testDataA, testDataB)
+			t.Errorf("Put failed but Get returned %+q, which is neither %+q nor %+q", buf, testDataA, testDataB)
 		}
 	}
 	if getErr == nil {
@@ -225,26 +225,32 @@ func testPutMultipleBlocks(t *testing.T, factory TestableVolumeFactory) {
 	data, err := v.Get(TestHash)
 	if err != nil {
 		t.Error(err)
-	} else if bytes.Compare(data, TestBlock) != 0 {
-		t.Errorf("Block present, but content is incorrect: Expected: %v  Found: %v", data, TestBlock)
+	} else {
+		if bytes.Compare(data, TestBlock) != 0 {
+			t.Errorf("Block present, but got %+q, expected %+q", data, TestBlock)
+		}
+		bufs.Put(data)
 	}
-	bufs.Put(data)
 
 	data, err = v.Get(TestHash2)
 	if err != nil {
 		t.Error(err)
-	} else if bytes.Compare(data, TestBlock2) != 0 {
-		t.Errorf("Block present, but content is incorrect: Expected: %v  Found: %v", data, TestBlock2)
+	} else {
+		if bytes.Compare(data, TestBlock2) != 0 {
+			t.Errorf("Block present, but got %+q, expected %+q", data, TestBlock2)
+		}
+		bufs.Put(data)
 	}
-	bufs.Put(data)
 
 	data, err = v.Get(TestHash3)
 	if err != nil {
 		t.Error(err)
-	} else if bytes.Compare(data, TestBlock3) != 0 {
-		t.Errorf("Block present, but content is incorrect: Expected: %v  Found: %v", data, TestBlock3)
+	} else {
+		if bytes.Compare(data, TestBlock3) != 0 {
+			t.Errorf("Block present, but to %+q, expected %+q", data, TestBlock3)
+		}
+		bufs.Put(data)
 	}
-	bufs.Put(data)
 }
 
 // testPutAndTouch
@@ -371,6 +377,7 @@ func testIndexTo(t *testing.T, factory TestableVolumeFactory) {
 func testDeleteNewBlock(t *testing.T, factory TestableVolumeFactory) {
 	v := factory(t)
 	defer v.Teardown()
+	blobSignatureTTL = 300 * time.Second
 
 	if v.Writable() == false {
 		return
@@ -384,10 +391,12 @@ func testDeleteNewBlock(t *testing.T, factory TestableVolumeFactory) {
 	data, err := v.Get(TestHash)
 	if err != nil {
 		t.Error(err)
-	} else if bytes.Compare(data, TestBlock) != 0 {
-		t.Error("Block still present, but content is incorrect: %+v != %+v", data, TestBlock)
+	} else {
+		if bytes.Compare(data, TestBlock) != 0 {
+			t.Errorf("Got data %+q, expected %+q", data, TestBlock)
+		}
+		bufs.Put(data)
 	}
-	bufs.Put(data)
 }
 
 // Calling Delete() for a block with a timestamp older than
@@ -396,19 +405,20 @@ func testDeleteNewBlock(t *testing.T, factory TestableVolumeFactory) {
 func testDeleteOldBlock(t *testing.T, factory TestableVolumeFactory) {
 	v := factory(t)
 	defer v.Teardown()
+	blobSignatureTTL = 300 * time.Second
 
 	if v.Writable() == false {
 		return
 	}
 
 	v.Put(TestHash, TestBlock)
-	v.TouchWithDate(TestHash, time.Now().Add(-2*blobSignatureTTL*time.Second))
+	v.TouchWithDate(TestHash, time.Now().Add(-2*blobSignatureTTL))
 
 	if err := v.Delete(TestHash); err != nil {
 		t.Error(err)
 	}
 	if _, err := v.Get(TestHash); err == nil || !os.IsNotExist(err) {
-		t.Errorf("os.IsNotExist(%v) should have been true", err.Error())
+		t.Errorf("os.IsNotExist(%v) should have been true", err)
 	}
 }