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

Clean up commented code

Browse Source
This commit is contained in:
Arthur Barr
2018-02-20 14:44:24 +00:00
parent 05d1c6f0de
commit 3600841e2b
4 changed files with 0 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/docker/docker_api_test_util.go
View File

@@ -117,14 +117,6 @@ func runContainer(t *testing.T, cli *client.Client, containerConfig *container.C
// if coverage
containerConfig.Env = append(containerConfig.Env, "COVERAGE_FILE="+t.Name()+".cov")
hostConfig := container.HostConfig{
// PortBindings: nat.PortMap{
// "1414/tcp": []nat.PortBinding{
// {
// HostIP: "0.0.0.0",
// HostPort: "1414",
// },
// },
// },
Binds: []string{
coverageBind(t),
},
@@ -191,8 +183,6 @@ func getCoverageExitCode(t *testing.T, orig int64) int64 {
// waitForContainer waits until a container has exited
func waitForContainer(t *testing.T, cli *client.Client, ID string, timeout int64) int64 {
//ctx, cancel := context.WithTimeout(context.Background(), time.Duration(timeout)*time.Second)
//defer cancel()
rc, err := cli.ContainerWait(context.Background(), ID)
if coverage() {
@@ -202,11 +192,9 @@ func waitForContainer(t *testing.T, cli *client.Client, ID string, timeout int64
rc = getCoverageExitCode(t, rc)
}
// err := <-errC
if err != nil {
t.Fatal(err)
}
// wait := <-waitC
return rc
}