kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #37264 from adshmh/refactor-inspect-network-integration-tests-use-network-create

Browse source 
refactor network inspect integration tests to use network package
This commit is contained in:
Sebastiaan van Stijn 2018-06-21 19:01:24 -07:00 committed by GitHub
commit 5828df4e5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
integration/internal/network/ops.go
View file

@ -19,7 +19,7 @@ func WithIPv6() func(*types.NetworkCreate) {
}
}
// WithCheckDuplicate enables CheckDuplicate on the create network request
// WithCheckDuplicate sets the CheckDuplicate field on create network request
func WithCheckDuplicate() func(*types.NetworkCreate) {
return func(n *types.NetworkCreate) {
n.CheckDuplicate = true

15
integration/network/inspect_test.go
View file

@ -9,6 +9,7 @@ import (
"github.com/docker/docker/api/types/filters"
swarmtypes "github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/client"
"github.com/docker/docker/integration/internal/network"
"github.com/docker/docker/integration/internal/swarm"
"gotest.tools/assert"
"gotest.tools/poll"
@ -24,14 +25,10 @@ func TestInspectNetwork(t *testing.T) {
defer client.Close()
overlayName := "overlay1"
networkCreate := types.NetworkCreate{
CheckDuplicate: true,
Driver: "overlay",
}
netResp, err := client.NetworkCreate(context.Background(), overlayName, networkCreate)
assert.NilError(t, err)
overlayID := netResp.ID
overlayID := network.CreateNoError(t, context.Background(), client, overlayName,
network.WithDriver("overlay"),
network.WithCheckDuplicate(),
)
var instances uint64 = 4
serviceName := "TestService" + t.Name()
@ -44,7 +41,7 @@ func TestInspectNetwork(t *testing.T) {
poll.WaitOn(t, serviceRunningTasksCount(client, serviceID, instances), swarm.ServicePoll)
_, _, err = client.ServiceInspectWithRaw(context.Background(), serviceID, types.ServiceInspectOptions{})
_, _, err := client.ServiceInspectWithRaw(context.Background(), serviceID, types.ServiceInspectOptions{})
assert.NilError(t, err)
// Test inspect verbose with full NetworkID