projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
8016: Report container resource usage in "crunchstat" log.
[arvados.git]
/
services
/
keepstore
/
trash_worker_test.go
diff --git
a/services/keepstore/trash_worker_test.go
b/services/keepstore/trash_worker_test.go
index ac9406178c00ffaffc024f61ffc981479fc9d4e9..d111caeac8e5b571202502e0aea63f07816365ba 100644
(file)
--- a/
services/keepstore/trash_worker_test.go
+++ b/
services/keepstore/trash_worker_test.go
@@
-290,26
+290,27
@@
func performTrashWorkerTest(testData TrashWorkerTestData, t *testing.T) {
expectEqualWithin(t, time.Second, 0, func() interface{} { return trashq.Status().InProgress })
// Verify Locator1 to be un/deleted as expected
expectEqualWithin(t, time.Second, 0, func() interface{} { return trashq.Status().InProgress })
// Verify Locator1 to be un/deleted as expected
- data, _ := GetBlock(testData.Locator1)
+ buf := make([]byte, BlockSize)
+ size, err := GetBlock(testData.Locator1, buf, nil)
if testData.ExpectLocator1 {
if testData.ExpectLocator1 {
- if
len(data) == 0
{
+ if
size == 0 || err != nil
{
t.Errorf("Expected Locator1 to be still present: %s", testData.Locator1)
}
} else {
t.Errorf("Expected Locator1 to be still present: %s", testData.Locator1)
}
} else {
- if
len(data) > 0
{
+ if
size > 0 || err == nil
{
t.Errorf("Expected Locator1 to be deleted: %s", testData.Locator1)
}
}
// Verify Locator2 to be un/deleted as expected
if testData.Locator1 != testData.Locator2 {
t.Errorf("Expected Locator1 to be deleted: %s", testData.Locator1)
}
}
// Verify Locator2 to be un/deleted as expected
if testData.Locator1 != testData.Locator2 {
-
data, _ = GetBlock(testData.Locator2
)
+
size, err = GetBlock(testData.Locator2, buf, nil
)
if testData.ExpectLocator2 {
if testData.ExpectLocator2 {
- if
len(data) == 0
{
+ if
size == 0 || err != nil
{
t.Errorf("Expected Locator2 to be still present: %s", testData.Locator2)
}
} else {
t.Errorf("Expected Locator2 to be still present: %s", testData.Locator2)
}
} else {
- if
len(data) > 0
{
+ if
size > 0 || err == nil
{
t.Errorf("Expected Locator2 to be deleted: %s", testData.Locator2)
}
}
t.Errorf("Expected Locator2 to be deleted: %s", testData.Locator2)
}
}
@@
-321,7
+322,8
@@
func performTrashWorkerTest(testData TrashWorkerTestData, t *testing.T) {
if testData.DifferentMtimes {
locatorFoundIn := 0
for _, volume := range KeepVM.AllReadable() {
if testData.DifferentMtimes {
locatorFoundIn := 0
for _, volume := range KeepVM.AllReadable() {
- if _, err := volume.Get(testData.Locator1); err == nil {
+ buf := make([]byte, BlockSize)
+ if _, err := volume.Get(testData.Locator1, buf); err == nil {
locatorFoundIn = locatorFoundIn + 1
}
}
locatorFoundIn = locatorFoundIn + 1
}
}