mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-07-30 18:23:29 +03:00
Code Activity

integration-cli: DockerNetworkSuite: replace dockerCmd and waitRun

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2023-07-27 12:58:10 +02:00
parent 5cc978c6a0
commit dbb2bd727d
2 changed files with 238 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

467
integration-cli/docker_cli_network_unix_test.go
View File

File diff suppressed because it is too large Load Diff

11
integration-cli/docker_deprecated_api_v124_unix_test.go
View File

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