projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix nodemanager test race. No issue #
[arvados.git]
/
services
/
keepstore
/
volume_test.go
diff --git
a/services/keepstore/volume_test.go
b/services/keepstore/volume_test.go
index 5467ed541b3dc90974e3d70ea531971b48f70341..53ffeef0bba186d7f995e6e6afb00feb194c5e7f 100644
(file)
--- a/
services/keepstore/volume_test.go
+++ b/
services/keepstore/volume_test.go
@@
-183,14
+183,14
@@
func (v *MockVolume) IndexTo(prefix string, w io.Writer) error {
return nil
}
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 {
v.gotCall("Delete")
<-v.Gate
if v.Readonly {
return MethodDisabledError
}
if _, ok := v.Store[loc]; ok {
- if time.Since(v.Timestamps[loc]) < blob
_signature_ttl
{
+ if time.Since(v.Timestamps[loc]) < blob
SignatureTTL
{
return nil
}
delete(v.Store, loc)
return nil
}
delete(v.Store, loc)
@@
-199,6
+199,11
@@
func (v *MockVolume) Delete(loc string) error {
return os.ErrNotExist
}
return os.ErrNotExist
}
+// TBD
+func (v *MockVolume) Untrash(loc string) error {
+ return nil
+}
+
func (v *MockVolume) Status() *VolumeStatus {
var used uint64
for _, block := range v.Store {
func (v *MockVolume) Status() *VolumeStatus {
var used uint64
for _, block := range v.Store {
@@
-214,3
+219,7
@@
func (v *MockVolume) String() string {
func (v *MockVolume) Writable() bool {
return !v.Readonly
}
func (v *MockVolume) Writable() bool {
return !v.Readonly
}
+
+func (v *MockVolume) Replication() int {
+ return 1
+}