X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f04cfcce18c6e4bd1faf3140ccbc835328580024..f935965259f9c0476a9c5ffa79e5c27ce9da4800:/services/keepstore/volume_test.go diff --git a/services/keepstore/volume_test.go b/services/keepstore/volume_test.go index e8a5a338f5..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 { @@ -190,7 +189,7 @@ func (v *MockVolume) Trash(loc string) error { 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,7 +198,14 @@ func (v *MockVolume) Trash(loc string) error { return os.ErrNotExist } -// TBD +func (v *MockVolume) Type() string { + return "Mock" +} + +func (v *MockVolume) Start() error { + return nil +} + func (v *MockVolume) Untrash(loc string) error { return nil }