X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9bd0009d81d3bcdb1b1b1b3ff070537b6ff68f54..38de76ceaabe6f1b522a538a27dfeb2f58c5fb69:/services/keepstore/handlers_with_generic_volume_test.go diff --git a/services/keepstore/handlers_with_generic_volume_test.go b/services/keepstore/handlers_with_generic_volume_test.go index dda7edcec3..181e651d3b 100644 --- a/services/keepstore/handlers_with_generic_volume_test.go +++ b/services/keepstore/handlers_with_generic_volume_test.go @@ -2,6 +2,7 @@ package main import ( "bytes" + "context" ) // A TestableVolumeManagerFactory creates a volume manager with at least two TestableVolume instances. @@ -46,7 +47,7 @@ func testGetBlock(t TB, factory TestableVolumeManagerFactory, testHash string, t // Get should pass buf := make([]byte, len(testBlock)) - n, err := GetBlock(testHash, buf, nil) + n, err := GetBlock(context.Background(), testHash, buf, nil) if err != nil { t.Fatalf("Error while getting block %s", err) } @@ -66,7 +67,7 @@ func testPutRawBadDataGetBlock(t TB, factory TestableVolumeManagerFactory, // Get should fail buf := make([]byte, BlockSize) - size, err := GetBlock(testHash, buf, nil) + size, err := GetBlock(context.Background(), testHash, buf, nil) if err == nil { t.Fatalf("Got %+q, expected error while getting corrupt block %v", buf[:size], testHash) } @@ -77,18 +78,18 @@ func testPutBlock(t TB, factory TestableVolumeManagerFactory, testHash string, t setupHandlersWithGenericVolumeTest(t, factory) // PutBlock - if _, err := PutBlock(testBlock, testHash); err != nil { + if _, err := PutBlock(context.Background(), testBlock, testHash); err != nil { t.Fatalf("Error during PutBlock: %s", err) } // Check that PutBlock succeeds again even after CompareAndTouch - if _, err := PutBlock(testBlock, testHash); err != nil { + if _, err := PutBlock(context.Background(), testBlock, testHash); err != nil { t.Fatalf("Error during PutBlock: %s", err) } // Check that PutBlock stored the data as expected buf := make([]byte, BlockSize) - size, err := GetBlock(testHash, buf, nil) + size, err := GetBlock(context.Background(), testHash, buf, nil) if err != nil { t.Fatalf("Error during GetBlock for %q: %s", testHash, err) } else if bytes.Compare(buf[:size], testBlock) != 0 { @@ -106,14 +107,14 @@ func testPutBlockCorrupt(t TB, factory TestableVolumeManagerFactory, testableVolumes[1].PutRaw(testHash, badData) // Check that PutBlock with good data succeeds - if _, err := PutBlock(testBlock, testHash); err != nil { + if _, err := PutBlock(context.Background(), testBlock, testHash); err != nil { t.Fatalf("Error during PutBlock for %q: %s", testHash, err) } // Put succeeded and overwrote the badData in one volume, // and Get should return the testBlock now, ignoring the bad data. buf := make([]byte, BlockSize) - size, err := GetBlock(testHash, buf, nil) + size, err := GetBlock(context.Background(), testHash, buf, nil) if err != nil { t.Fatalf("Error during GetBlock for %q: %s", testHash, err) } else if bytes.Compare(buf[:size], testBlock) != 0 {