X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/cb48eb95d516b1d4a1ffe18be34703005531117a..4e9fd075b8136613e7edbb0465bcb96ccf5b1f45:/services/keepstore/volume_test.go

diff --git a/services/keepstore/volume_test.go b/services/keepstore/volume_test.go
index d6714365de..6ab386aec4 100644
--- a/services/keepstore/volume_test.go
+++ b/services/keepstore/volume_test.go
@@ -113,17 +113,16 @@ func (v *MockVolume) Compare(loc string, buf []byte) error {
 	}
 }
 
-func (v *MockVolume) Get(loc string) ([]byte, error) {
+func (v *MockVolume) Get(loc string, buf []byte) (int, error) {
 	v.gotCall("Get")
 	<-v.Gate
 	if v.Bad {
-		return nil, errors.New("Bad volume")
+		return 0, errors.New("Bad volume")
 	} else if block, ok := v.Store[loc]; ok {
-		buf := bufs.Get(len(block))
-		copy(buf, block)
-		return buf, nil
+		copy(buf[:len(block)], block)
+		return len(block), nil
 	}
-	return nil, os.ErrNotExist
+	return 0, os.ErrNotExist
 }
 
 func (v *MockVolume) Put(loc string, block []byte) error {
@@ -183,14 +182,14 @@ func (v *MockVolume) IndexTo(prefix string, w io.Writer) error {
 	return nil
 }
 
-func (v *MockVolume) Delete(loc string) error {
+func (v *MockVolume) Trash(loc string) error {
 	v.gotCall("Delete")
 	<-v.Gate
 	if v.Readonly {
 		return MethodDisabledError
 	}
 	if _, ok := v.Store[loc]; ok {
-		if time.Since(v.Timestamps[loc]) < blobSignatureTTL {
+		if time.Since(v.Timestamps[loc]) < time.Duration(theConfig.BlobSignatureTTL) {
 			return nil
 		}
 		delete(v.Store, loc)
@@ -199,6 +198,18 @@ func (v *MockVolume) Delete(loc string) error {
 	return os.ErrNotExist
 }
 
+func (v *MockVolume) Type() string {
+	return "Mock"
+}
+
+func (v *MockVolume) Start() error {
+	return nil
+}
+
+func (v *MockVolume) Untrash(loc string) error {
+	return nil
+}
+
 func (v *MockVolume) Status() *VolumeStatus {
 	var used uint64
 	for _, block := range v.Store {
@@ -218,3 +229,6 @@ func (v *MockVolume) Writable() bool {
 func (v *MockVolume) Replication() int {
 	return 1
 }
+
+func (v *MockVolume) EmptyTrash() {
+}