|
@@ -6,6 +6,7 @@ import (
|
|
|
"strings"
|
|
|
"testing"
|
|
|
|
|
|
+ "github.com/docker/docker/integration-cli/cli"
|
|
|
"github.com/docker/docker/testutil"
|
|
|
"github.com/docker/docker/testutil/request"
|
|
|
"gotest.tools/v3/assert"
|
|
@@ -13,10 +14,10 @@ import (
|
|
|
|
|
|
// #19100 This is a deprecated feature test, it should be removed in Docker 1.12
|
|
|
func (s *DockerNetworkSuite) TestDeprecatedDockerNetworkStartAPIWithHostconfig(c *testing.T) {
|
|
|
- netName := "test"
|
|
|
- conName := "foo"
|
|
|
- dockerCmd(c, "network", "create", netName)
|
|
|
- dockerCmd(c, "create", "--name", conName, "busybox", "top")
|
|
|
+ const netName = "test"
|
|
|
+ const conName = "foo"
|
|
|
+ cli.DockerCmd(c, "network", "create", netName)
|
|
|
+ cli.DockerCmd(c, "create", "--name", conName, "busybox", "top")
|
|
|
|
|
|
config := map[string]interface{}{
|
|
|
"HostConfig": map[string]interface{}{
|
|
@@ -25,7 +26,7 @@ func (s *DockerNetworkSuite) TestDeprecatedDockerNetworkStartAPIWithHostconfig(c
|
|
|
}
|
|
|
_, _, err := request.Post(testutil.GetContext(c), formatV123StartAPIURL("/containers/"+conName+"/start"), request.JSONBody(config))
|
|
|
assert.NilError(c, err)
|
|
|
- assert.NilError(c, waitRun(conName))
|
|
|
+ cli.WaitRun(c, conName)
|
|
|
networks := inspectField(c, conName, "NetworkSettings.Networks")
|
|
|
assert.Assert(c, strings.Contains(networks, netName), "Should contain '%s' network", netName)
|
|
|
assert.Assert(c, !strings.Contains(networks, "bridge"), "Should not contain 'bridge' network")
|