X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6ac861fd4a44cb39371a66d96b77ad7a41c85d3b..ae50ec2fec20b96a208619421a97a7b41c7a6ac5:/services/keepstore/volume_test.go diff --git a/services/keepstore/volume_test.go b/services/keepstore/volume_test.go index 2af1ad68d8..5671b8d4a9 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 { @@ -201,7 +200,7 @@ func (v *MockVolume) Trash(loc string) error { // TBD func (v *MockVolume) Untrash(loc string) error { - return ErrNotImplemented + return nil } func (v *MockVolume) Status() *VolumeStatus { @@ -223,3 +222,6 @@ func (v *MockVolume) Writable() bool { func (v *MockVolume) Replication() int { return 1 } + +func (v *MockVolume) EmptyTrash() { +}