projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '14946-ruby-2.5'
[arvados.git]
/
services
/
crunch-run
/
copier_test.go
diff --git
a/services/crunch-run/copier_test.go
b/services/crunch-run/copier_test.go
index a2b560889f5b40cf488739a05bb77c63644152d8..c0fe38008d9a419f1ccfd17e10bde60803cfa29f 100644
(file)
--- a/
services/crunch-run/copier_test.go
+++ b/
services/crunch-run/copier_test.go
@@
-111,7
+111,7
@@
func (s *copierSuite) TestSymlinkToMountedCollection(c *check.C) {
// simulate mounted read-only collection
s.cp.mounts["/mnt"] = arvados.Mount{
Kind: "collection",
// simulate mounted read-only collection
s.cp.mounts["/mnt"] = arvados.Mount{
Kind: "collection",
- PortableDataHash: arvadostest.Foo
Pdh
,
+ PortableDataHash: arvadostest.Foo
CollectionPDH
,
}
// simulate mounted writable collection
}
// simulate mounted writable collection
@@
-125,7
+125,7
@@
func (s *copierSuite) TestSymlinkToMountedCollection(c *check.C) {
c.Assert(f.Close(), check.IsNil)
s.cp.mounts["/mnt-w"] = arvados.Mount{
Kind: "collection",
c.Assert(f.Close(), check.IsNil)
s.cp.mounts["/mnt-w"] = arvados.Mount{
Kind: "collection",
- PortableDataHash: arvadostest.Foo
Pdh
,
+ PortableDataHash: arvadostest.Foo
CollectionPDH
,
Writable: true,
}
s.cp.binds = append(s.cp.binds, bindtmp+":/mnt-w")
Writable: true,
}
s.cp.binds = append(s.cp.binds, bindtmp+":/mnt-w")
@@
-197,7
+197,7
@@
func (s *copierSuite) TestUnsupportedMountKindBelow(c *check.C) {
func (s *copierSuite) TestWritableMountBelow(c *check.C) {
s.cp.mounts["/ctr/outdir/mount"] = arvados.Mount{
Kind: "collection",
func (s *copierSuite) TestWritableMountBelow(c *check.C) {
s.cp.mounts["/ctr/outdir/mount"] = arvados.Mount{
Kind: "collection",
- PortableDataHash: arvadostest.Foo
Pdh
,
+ PortableDataHash: arvadostest.Foo
CollectionPDH
,
Writable: true,
}
c.Assert(os.MkdirAll(s.cp.hostOutputDir+"/mount", 0755), check.IsNil)
Writable: true,
}
c.Assert(os.MkdirAll(s.cp.hostOutputDir+"/mount", 0755), check.IsNil)