11644: Add pull-to-mount-UUID test. Tidy up pull worker and tests.

[arvados.git] / services / keepstore / pull_worker_integration_test.go

diff --git a/services/keepstore/pull_worker_integration_test.go b/services/keepstore/pull_worker_integration_test.go
index 7ba72672cfc95831b9e547b2d5430fbdea385821..8c7a1e222ddc8905041161cee67d605334285a65 100644 (file)
--- a/services/keepstore/pull_worker_integration_test.go
+++ b/services/keepstore/pull_worker_integration_test.go
@@ -4,6 +4,7 @@ import (
        "bytes"
        "errors"
        "io"
+       "io/ioutil"
        "net/http"
        "os"
        "strings"
@@ -122,12 +123,11 @@ func performPullWorkerIntegrationTest(testData PullWorkIntegrationTestData, pull
        defer func(orig func(string, *keepclient.KeepClient) (io.ReadCloser, int64, string, error)) {
                GetContent = orig
        }(GetContent)
-       GetContent = func(signedLocator string, keepClient *keepclient.KeepClient) (
-               reader io.ReadCloser, contentLength int64, url string, err error) {
+       GetContent = func(signedLocator string, keepClient *keepclient.KeepClient) (reader io.ReadCloser, contentLength int64, url string, err error) {
                if testData.GetError != "" {
                        return nil, 0, "", errors.New(testData.GetError)
                }
-               rdr := &ClosingBuffer{bytes.NewBufferString(testData.Content)}
+               rdr := ioutil.NopCloser(bytes.NewBufferString(testData.Content))
                return rdr, int64(len(testData.Content)), "", nil
        }