From: Peter Amstutz Date: Fri, 3 Nov 2017 19:04:00 +0000 (-0400) Subject: 12538: Fix tests. X-Git-Tag: 1.1.1~11^2~4 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/fff3b19b8a7b8eca06065bdf60b0541c26e27935?ds=sidebyside 12538: Fix tests. Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go index 55edb99823..9e054894ad 100644 --- a/services/crunch-run/crunchrun.go +++ b/services/crunch-run/crunchrun.go @@ -1299,7 +1299,9 @@ func (runner *ContainerRunner) CleanupDirs() { func (runner *ContainerRunner) CommitLogs() error { runner.CrunchLog.Print(runner.finalState) - runner.arvMountLog.Close() + if runner.arvMountLog != nil { + runner.arvMountLog.Close() + } runner.CrunchLog.Close() // Closing CrunchLog above allows them to be committed to Keep at this diff --git a/services/crunch-run/crunchrun_test.go b/services/crunch-run/crunchrun_test.go index d3c9990770..5992be0625 100644 --- a/services/crunch-run/crunchrun_test.go +++ b/services/crunch-run/crunchrun_test.go @@ -131,7 +131,7 @@ func (t *TestDockerClient) ContainerCreate(ctx context.Context, config *dockerco func (t *TestDockerClient) ContainerStart(ctx context.Context, container string, options dockertypes.ContainerStartOptions) error { if container == "abcde" { - go t.fn(t) + // t.fn gets executed in ContainerWait return nil } else { return errors.New("Invalid container id") @@ -147,6 +147,7 @@ func (t *TestDockerClient) ContainerWait(ctx context.Context, container string, body := make(chan dockercontainer.ContainerWaitOKBody) err := make(chan error) go func() { + t.fn(t) body <- dockercontainer.ContainerWaitOKBody{StatusCode: int64(t.finish)} close(body) close(err) @@ -1002,10 +1003,12 @@ func (s *TestSuite) TestSetupMounts(c *C) { cr.Container.Mounts = make(map[string]arvados.Mount) cr.Container.Mounts["/tmp"] = arvados.Mount{Kind: "tmp"} cr.OutputPath = "/tmp" - + cr.statInterval = 5 * time.Second err := cr.SetupMounts() c.Check(err, IsNil) - c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", + "--read-write", "--crunchstat-interval=5", + "--mount-by-pdh", "by_id", realTemp + "/keep1"}) c.Check(cr.Binds, DeepEquals, []string{realTemp + "/2:/tmp"}) cr.CleanupDirs() checkEmpty() @@ -1021,7 +1024,9 @@ func (s *TestSuite) TestSetupMounts(c *C) { err := cr.SetupMounts() c.Check(err, IsNil) - c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", + "--read-write", "--crunchstat-interval=5", + "--mount-by-pdh", "by_id", realTemp + "/keep1"}) c.Check(cr.Binds, DeepEquals, []string{realTemp + "/2:/out", realTemp + "/3:/tmp"}) cr.CleanupDirs() checkEmpty() @@ -1039,7 +1044,9 @@ func (s *TestSuite) TestSetupMounts(c *C) { err := cr.SetupMounts() c.Check(err, IsNil) - c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", + "--read-write", "--crunchstat-interval=5", + "--mount-by-pdh", "by_id", realTemp + "/keep1"}) c.Check(cr.Binds, DeepEquals, []string{realTemp + "/2:/tmp", stubCertPath + ":/etc/arvados/ca-certificates.crt:ro"}) cr.CleanupDirs() checkEmpty() @@ -1059,7 +1066,9 @@ func (s *TestSuite) TestSetupMounts(c *C) { err := cr.SetupMounts() c.Check(err, IsNil) - c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", + "--read-write", "--crunchstat-interval=5", + "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) c.Check(cr.Binds, DeepEquals, []string{realTemp + "/keep1/tmp0:/keeptmp"}) cr.CleanupDirs() checkEmpty() @@ -1079,7 +1088,9 @@ func (s *TestSuite) TestSetupMounts(c *C) { err := cr.SetupMounts() c.Check(err, IsNil) - c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", + "--read-write", "--crunchstat-interval=5", + "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) sort.StringSlice(cr.Binds).Sort() c.Check(cr.Binds, DeepEquals, []string{realTemp + "/keep1/by_id/59389a8f9ee9d399be35462a0f92541c+53:/keepinp:ro", realTemp + "/keep1/tmp0:/keepout"}) @@ -1102,7 +1113,9 @@ func (s *TestSuite) TestSetupMounts(c *C) { err := cr.SetupMounts() c.Check(err, IsNil) - c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--file-cache", "512", "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", + "--read-write", "--crunchstat-interval=5", + "--file-cache", "512", "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) sort.StringSlice(cr.Binds).Sort() c.Check(cr.Binds, DeepEquals, []string{realTemp + "/keep1/by_id/59389a8f9ee9d399be35462a0f92541c+53:/keepinp:ro", realTemp + "/keep1/tmp0:/keepout"}) @@ -1149,7 +1162,9 @@ func (s *TestSuite) TestSetupMounts(c *C) { err := cr.SetupMounts() c.Check(err, IsNil) - c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--file-cache", "512", "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", + "--read-write", "--crunchstat-interval=5", + "--file-cache", "512", "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) c.Check(cr.Binds, DeepEquals, []string{realTemp + "/2:/tmp", realTemp + "/keep1/tmp0:/tmp/foo:ro"}) cr.CleanupDirs() checkEmpty()