From e5199566d2bdfe207d8d06ba0f555cca801fd31b Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Thu, 22 Jul 2021 17:32:44 -0400 Subject: [PATCH] 17813: Fix tests Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- lib/crunchrun/crunchrun_test.go | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/lib/crunchrun/crunchrun_test.go b/lib/crunchrun/crunchrun_test.go index fa34adf50e..bb982cdee7 100644 --- a/lib/crunchrun/crunchrun_test.go +++ b/lib/crunchrun/crunchrun_test.go @@ -406,16 +406,6 @@ func (s *TestSuite) TestLoadImage(c *C) { imageID, err = s.runner.LoadImage() c.Check(err, ErrorMatches, "image collection does not include a \\.tar image file") c.Check(s.executor.loaded, Equals, "") - - // if executor reports image is already loaded, LoadImage should not be called - s.runner.Container.ContainerImage = arvadostest.DockerImage112PDH - s.executor.imageLoaded = true - s.executor.loaded = "" - s.executor.loadErr = nil - imageID, err = s.runner.LoadImage() - c.Check(err, IsNil) - c.Check(s.executor.loaded, Equals, "") - c.Check(imageID, Equals, strings.TrimSuffix(arvadostest.DockerImage112Filename, ".tar")) } type ArvErrorTestClient struct{} @@ -1115,7 +1105,7 @@ func (s *TestSuite) TestSetupMounts(c *C) { c.Check(err, IsNil) c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--storage-classes", "default", "--crunchstat-interval=5", - "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + "--mount-by-pdh", "by_id", "--mount-by-id", "by_uuid", realTemp + "/keep1"}) c.Check(bindmounts, DeepEquals, map[string]bindmount{"/tmp": {realTemp + "/tmp2", false}}) os.RemoveAll(cr.ArvMountPoint) cr.CleanupDirs() @@ -1135,7 +1125,7 @@ func (s *TestSuite) TestSetupMounts(c *C) { c.Check(err, IsNil) c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--storage-classes", "foo,bar", "--crunchstat-interval=5", - "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + "--mount-by-pdh", "by_id", "--mount-by-id", "by_uuid", realTemp + "/keep1"}) c.Check(bindmounts, DeepEquals, map[string]bindmount{"/out": {realTemp + "/tmp2", false}, "/tmp": {realTemp + "/tmp3", false}}) os.RemoveAll(cr.ArvMountPoint) cr.CleanupDirs() @@ -1155,7 +1145,7 @@ func (s *TestSuite) TestSetupMounts(c *C) { c.Check(err, IsNil) c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--storage-classes", "default", "--crunchstat-interval=5", - "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + "--mount-by-pdh", "by_id", "--mount-by-id", "by_uuid", realTemp + "/keep1"}) c.Check(bindmounts, DeepEquals, map[string]bindmount{"/tmp": {realTemp + "/tmp2", false}, "/etc/arvados/ca-certificates.crt": {stubCertPath, true}}) os.RemoveAll(cr.ArvMountPoint) cr.CleanupDirs() @@ -1178,7 +1168,7 @@ func (s *TestSuite) TestSetupMounts(c *C) { c.Check(err, IsNil) c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--storage-classes", "default", "--crunchstat-interval=5", - "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", "--mount-by-id", "by_uuid", realTemp + "/keep1"}) c.Check(bindmounts, DeepEquals, map[string]bindmount{"/keeptmp": {realTemp + "/keep1/tmp0", false}}) os.RemoveAll(cr.ArvMountPoint) cr.CleanupDirs() @@ -1201,7 +1191,7 @@ func (s *TestSuite) TestSetupMounts(c *C) { c.Check(err, IsNil) c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--storage-classes", "default", "--crunchstat-interval=5", - "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", "--mount-by-id", "by_uuid", realTemp + "/keep1"}) c.Check(bindmounts, DeepEquals, map[string]bindmount{ "/keepinp": {realTemp + "/keep1/by_id/59389a8f9ee9d399be35462a0f92541c+53", true}, "/keepout": {realTemp + "/keep1/tmp0", false}, @@ -1228,7 +1218,7 @@ func (s *TestSuite) TestSetupMounts(c *C) { c.Check(err, IsNil) c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--storage-classes", "default", "--crunchstat-interval=5", - "--file-cache", "512", "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + "--file-cache", "512", "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", "--mount-by-id", "by_uuid", realTemp + "/keep1"}) c.Check(bindmounts, DeepEquals, map[string]bindmount{ "/keepinp": {realTemp + "/keep1/by_id/59389a8f9ee9d399be35462a0f92541c+53", true}, "/keepout": {realTemp + "/keep1/tmp0", false}, @@ -1311,7 +1301,7 @@ func (s *TestSuite) TestSetupMounts(c *C) { c.Check(err, IsNil) c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--storage-classes", "default", "--crunchstat-interval=5", - "--file-cache", "512", "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + "--file-cache", "512", "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", "--mount-by-id", "by_uuid", realTemp + "/keep1"}) c.Check(bindmounts, DeepEquals, map[string]bindmount{ "/tmp": {realTemp + "/tmp2", false}, "/tmp/foo": {realTemp + "/keep1/tmp0", true}, -- 2.30.2