Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions integration-tests/pkg/executor/executor_docker_api.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,15 @@ func (d *dockerAPIExecutor) StartContainer(startConfig config.ContainerStartConf
if err != nil {
return "", errors.Wrapf(err, "create %s", startConfig.Name)
}

waitResp, waitErr := d.client.ContainerWait(ctx, resp.ID, container.WaitConditionNotRunning)
select {
case <-waitResp:
break
case err := <-waitErr:
return "", errors.Wrapf(err, "wait %s", startConfig.Name)
}

if err := d.client.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {
return "", errors.Wrapf(err, "start %s", startConfig.Name)
}
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/suites/base.go
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ func Mem2Numeric(value string) (float64, error) {
value, err := strconv.ParseFloat(numericPart, 32)
return value / 1024, err
} else {
return 0, errors.New(fmt.Sprintf("Invalid units, %s", value))
return 0, fmt.Errorf("Invalid units, %s", value)
}
}

Expand Down
Loading