Merge branch '9848-copy-container-output' refs #9848

[arvados.git] / sdk / go / keepclient / collectionreader_test.go

diff --git a/sdk/go/keepclient/collectionreader_test.go b/sdk/go/keepclient/collectionreader_test.go
index 9fb0d86114f8ce6dd273e560c227856dde3d7c25..be4f386ff229f7227ccdb03a722b9c3eeb63f8ff 100644 (file)
--- a/sdk/go/keepclient/collectionreader_test.go
+++ b/sdk/go/keepclient/collectionreader_test.go
@@ -19,7 +19,7 @@ import (
 var _ = check.Suite(&CollectionReaderUnit{})
 
 type CollectionReaderUnit struct {
-       arv     arvadosclient.ArvadosClient
+       arv     *arvadosclient.ArvadosClient
        kc      *KeepClient
        handler SuccessHandler
 }
@@ -30,7 +30,7 @@ func (s *CollectionReaderUnit) SetUpTest(c *check.C) {
        c.Assert(err, check.IsNil)
        s.arv.ApiToken = arvadostest.ActiveToken
 
-       s.kc, err = MakeKeepClient(&s.arv)
+       s.kc, err = MakeKeepClient(s.arv)
        c.Assert(err, check.IsNil)
 
        s.handler = SuccessHandler{
@@ -203,7 +203,7 @@ func (s *CollectionReaderUnit) TestCollectionReaderCloseEarly(c *check.C) {
 
        // doGet() should close toRead before sending any more bufs to it.
        if what, ok := <-rdr.(*cfReader).toRead; ok {
-               c.Errorf("Got %q, expected toRead to be closed", string(what))
+               c.Errorf("Got %q, expected toRead to be closed", what)
        }
 
        // Stub should have handled exactly one GET request.
@@ -220,4 +220,5 @@ func (s *CollectionReaderUnit) TestCollectionReaderDataError(c *check.C) {
                c.Check(err, check.NotNil)
                c.Check(err, check.Not(check.Equals), io.EOF)
        }
+       c.Check(rdr.Close(), check.NotNil)
 }