X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/94b92f075dbfb60a25fbe28e5741a553ac4985fd..75c5b123e0b4cbfebed9b15364a97c2209f94740:/services/crunch-run/crunchrun_test.go diff --git a/services/crunch-run/crunchrun_test.go b/services/crunch-run/crunchrun_test.go index 64eed2c1d3..8cefbedf19 100644 --- a/services/crunch-run/crunchrun_test.go +++ b/services/crunch-run/crunchrun_test.go @@ -139,8 +139,15 @@ func (t *TestDockerClient) ContainerStop(ctx context.Context, container string, return nil } -func (t *TestDockerClient) ContainerWait(ctx context.Context, container string) (int64, error) { - return int64(t.finish), nil +func (t *TestDockerClient) ContainerWait(ctx context.Context, container string, condition dockercontainer.WaitCondition) (<-chan dockercontainer.ContainerWaitOKBody, <-chan error) { + body := make(chan dockercontainer.ContainerWaitOKBody) + err := make(chan error) + go func() { + body <- dockercontainer.ContainerWaitOKBody{StatusCode: int64(t.finish)} + close(body) + close(err) + }() + return body, err } func (t *TestDockerClient) ImageInspectWithRaw(ctx context.Context, image string) (dockertypes.ImageInspect, []byte, error) { @@ -1491,7 +1498,7 @@ func (s *TestSuite) TestOutputError(c *C) { extraMounts := []string{} api, _, _ := FullRunHelper(c, helperRecord, extraMounts, 0, func(t *TestDockerClient) { - os.Symlink("/does/not/exist", t.realTemp+"/2/baz") + os.Symlink("/etc/hosts", t.realTemp+"/2/baz") t.logWriter.Close() })