X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1c18639421ece8d405fb8b1efab0966e75bffc19..refs/heads/5562-pycurl:/services/keepstore/trash_worker_test.go

diff --git a/services/keepstore/trash_worker_test.go b/services/keepstore/trash_worker_test.go
index 3031c2582d..af4040af81 100644
--- a/services/keepstore/trash_worker_test.go
+++ b/services/keepstore/trash_worker_test.go
@@ -187,9 +187,10 @@ func performTrashWorkerTest(testData TrashWorkerTestData, t *testing.T) {
 
 	// Create Keep Volumes
 	KeepVM = MakeTestVolumeManager(2)
+	defer KeepVM.Close()
 
 	// Put test content
-	vols := KeepVM.Volumes()
+	vols := KeepVM.AllWritable()
 	if testData.CreateData {
 		vols[0].Put(testData.Locator1, testData.Block1)
 		vols[0].Put(testData.Locator1+".meta", []byte("metadata"))
@@ -263,7 +264,7 @@ func performTrashWorkerTest(testData TrashWorkerTestData, t *testing.T) {
 	if (testData.ExpectLocator1) &&
 		(testData.Locator1 == testData.Locator2) {
 		locatorFoundIn := 0
-		for _, volume := range KeepVM.Volumes() {
+		for _, volume := range KeepVM.AllReadable() {
 			if _, err := volume.Get(testData.Locator1); err == nil {
 				locatorFoundIn = locatorFoundIn + 1
 			}
@@ -276,5 +277,4 @@ func performTrashWorkerTest(testData TrashWorkerTestData, t *testing.T) {
 	// Done
 	permission_ttl = actual_permission_ttl
 	trashq.Close()
-	KeepVM.Quit()
 }