From e00924fd7d44e405b1d395abe9b10b97414dcc72 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Thu, 24 Oct 2024 11:46:56 -0400 Subject: [PATCH] 22226: Simplify test. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- lib/crunchrun/copier_test.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/crunchrun/copier_test.go b/lib/crunchrun/copier_test.go index 151e33abd8..e874fc11d9 100644 --- a/lib/crunchrun/copier_test.go +++ b/lib/crunchrun/copier_test.go @@ -84,11 +84,7 @@ func (s *copierSuite) TestEmptyWritableMount(c *check.C) { } func (s *copierSuite) TestOutputCollectionWithOnlySubmounts(c *check.C) { - // Note this 6-byte "foo" file will not be copied, because - // it's superseded by the 3-byte "foo" file in FooCollection - // mounted at the same location. - s.writeFileInOutputDir(c, "foo", `foobar`) - s.writeFileInOutputDir(c, ".arvados#collection", `{"manifest_text":". 3858f62230ac3c915f300c664312c63f+6 0:6:foo\n"}`) + s.writeFileInOutputDir(c, ".arvados#collection", `{"manifest_text":""}`) s.cp.mounts[s.cp.ctrOutputDir] = arvados.Mount{ Kind: "collection", Writable: true, @@ -107,8 +103,8 @@ func (s *copierSuite) TestOutputCollectionWithOnlySubmounts(c *check.C) { c.Check(s.cp.dirs, check.DeepEquals, []string(nil)) c.Check(len(s.cp.files), check.Equals, 0) - // The 3-byte "foo" file has already been copied from - // FooCollection to s.cp.staged via Snapshot+Splice. + // The "foo" file has already been copied from FooCollection + // to s.cp.staged via Snapshot+Splice. rootdir, err := s.cp.staged.Open(".") c.Assert(err, check.IsNil) defer rootdir.Close() -- 2.30.2