X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8cf467878d09a862054800604c247c64c84b4955..5ce53e2ca74e56838fb4239c462ddd725b7a8456:/lib/crunchrun/copier_test.go

diff --git a/lib/crunchrun/copier_test.go b/lib/crunchrun/copier_test.go
index 07fd795efe..c8936d1a9f 100644
--- a/lib/crunchrun/copier_test.go
+++ b/lib/crunchrun/copier_test.go
@@ -12,7 +12,6 @@ import (
 	"syscall"
 
 	"git.arvados.org/arvados.git/sdk/go/arvados"
-	"git.arvados.org/arvados.git/sdk/go/arvadosclient"
 	"git.arvados.org/arvados.git/sdk/go/arvadostest"
 	"github.com/sirupsen/logrus"
 	check "gopkg.in/check.v1"
@@ -27,12 +26,9 @@ type copierSuite struct {
 
 func (s *copierSuite) SetUpTest(c *check.C) {
 	tmpdir := c.MkDir()
-	api, err := arvadosclient.MakeArvadosClient()
-	c.Assert(err, check.IsNil)
 	s.log = bytes.Buffer{}
 	s.cp = copier{
 		client:        arvados.NewClientFromEnv(),
-		arvClient:     api,
 		hostOutputDir: tmpdir,
 		ctrOutputDir:  "/ctr/outdir",
 		mounts: map[string]arvados.Mount{
@@ -132,7 +128,9 @@ func (s *copierSuite) TestSymlinkToMountedCollection(c *check.C) {
 		PortableDataHash: arvadostest.FooCollectionPDH,
 		Writable:         true,
 	}
-	s.cp.binds = append(s.cp.binds, bindtmp+":/mnt-w")
+	s.cp.bindmounts = map[string]bindmount{
+		"/mnt-w": bindmount{HostPath: bindtmp, ReadOnly: false},
+	}
 
 	c.Assert(os.Symlink("../../mnt", s.cp.hostOutputDir+"/l_dir"), check.IsNil)
 	c.Assert(os.Symlink("/mnt/foo", s.cp.hostOutputDir+"/l_file"), check.IsNil)