projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
10078: config parameter to hide / show recent_collections panel in dashboard.
[arvados.git]
/
services
/
keepstore
/
volume_generic_test.go
diff --git
a/services/keepstore/volume_generic_test.go
b/services/keepstore/volume_generic_test.go
index 4291c6cd1f3964f06a095214d2e7308d35ea93d4..bc3e537a89a815037102af7fb920e8b9d2b84f61 100644
(file)
--- a/
services/keepstore/volume_generic_test.go
+++ b/
services/keepstore/volume_generic_test.go
@@
-741,7
+741,7
@@
func testTrashUntrash(t TB, factory TestableVolumeFactory) {
v := factory(t)
defer v.Teardown()
defer func() {
v := factory(t)
defer v.Teardown()
defer func() {
- trashLifetime = 0
* time.Second
+ trashLifetime = 0
}()
trashLifetime = 3600 * time.Second
}()
trashLifetime = 3600 * time.Second
@@
-830,7
+830,7
@@
func testTrashEmptyTrashUntrash(t TB, factory TestableVolumeFactory) {
// First set: EmptyTrash before reaching the trash deadline.
// First set: EmptyTrash before reaching the trash deadline.
- trashLifetime =
1 *
time.Hour
+ trashLifetime = time.Hour
v.PutRaw(TestHash, TestBlock)
v.TouchWithDate(TestHash, time.Now().Add(-2*blobSignatureTTL))
v.PutRaw(TestHash, TestBlock)
v.TouchWithDate(TestHash, time.Now().Add(-2*blobSignatureTTL))
@@
-880,23
+880,27
@@
func testTrashEmptyTrashUntrash(t TB, factory TestableVolumeFactory) {
// Because we Touch'ed, need to backdate again for next set of tests
v.TouchWithDate(TestHash, time.Now().Add(-2*blobSignatureTTL))
// Because we Touch'ed, need to backdate again for next set of tests
v.TouchWithDate(TestHash, time.Now().Add(-2*blobSignatureTTL))
- // Untrash should fail if the only block in the trash has
- // already been untrashed.
+ // If the only block in the trash has already been untrashed,
+ // most volumes will fail a subsequent Untrash with a 404, but
+ // it's also acceptable for Untrash to succeed.
err = v.Untrash(TestHash)
err = v.Untrash(TestHash)
- if err
== nil ||
!os.IsNotExist(err) {
- t.Fatalf("
os.IsNotExist(%v) should have been true
", err)
+ if err
!= nil &&
!os.IsNotExist(err) {
+ t.Fatalf("
Expected success or os.IsNotExist(), but got: %v
", err)
}
}
- // The
failed
Untrash should not interfere with our
+ // The
additional
Untrash should not interfere with our
// already-untrashed copy.
err = checkGet()
if err != nil {
t.Fatal(err)
}
// already-untrashed copy.
err = checkGet()
if err != nil {
t.Fatal(err)
}
+ // Untrash might have updated the timestamp, so backdate again
+ v.TouchWithDate(TestHash, time.Now().Add(-2*blobSignatureTTL))
+
// Second set: EmptyTrash after the trash deadline has passed.
// Second set: EmptyTrash after the trash deadline has passed.
- trashLifetime =
1 *
time.Nanosecond
+ trashLifetime = time.Nanosecond
err = v.Trash(TestHash)
if err != nil {
err = v.Trash(TestHash)
if err != nil {
@@
-927,7
+931,6
@@
func testTrashEmptyTrashUntrash(t TB, factory TestableVolumeFactory) {
if err == nil || !os.IsNotExist(err) {
t.Fatalf("os.IsNotExist(%v) should have been true", err)
}
if err == nil || !os.IsNotExist(err) {
t.Fatalf("os.IsNotExist(%v) should have been true", err)
}
- // EmptryTrash
v.EmptyTrash()
// Untrash won't find it
v.EmptyTrash()
// Untrash won't find it