academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix occasional timing error in tests

Browse Source
This commit is contained in:
Arthur Barr
2018-03-12 16:28:40 +00:00
parent c75aed0851
commit b240a84ce0
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/docker/docker_api_test_util.go
View File

@@ -309,13 +309,23 @@ func execContainerWithOutput(t *testing.T, cli *client.Client, ID string, user s
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
cli.ContainerExecStart(context.Background(), resp.ID, types.ExecStartCheck{ err = cli.ContainerExecStart(context.Background(), resp.ID, types.ExecStartCheck{
Detach: false, Detach: false,
Tty: false, Tty: false,
}) })
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
// Wait for the command to finish
for {
inspect, err := cli.ContainerExecInspect(context.Background(), resp.ID)
if err != nil {
t.Fatal(err)
}
if !inspect.Running {
break
}
}
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
// Each output line has a header, which needs to be removed // Each output line has a header, which needs to be removed
_, err = stdcopy.StdCopy(buf, buf, hijack.Reader) _, err = stdcopy.StdCopy(buf, buf, hijack.Reader)