From dda4128c7ea6df5565e4ad3c0f0958a0aad547da Mon Sep 17 00:00:00 2001 From: Arash Deshmeh Date: Mon, 11 Jun 2018 12:11:22 -0400 Subject: [PATCH] refactor network inspect integration tests to use network package Signed-off-by: Arash Deshmeh --- integration/internal/network/ops.go | 2 +- integration/network/inspect_test.go | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/integration/internal/network/ops.go b/integration/internal/network/ops.go index 8bec62d79e..9b69b79bfb 100644 --- a/integration/internal/network/ops.go +++ b/integration/internal/network/ops.go @@ -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 diff --git a/integration/network/inspect_test.go b/integration/network/inspect_test.go index 659ca29735..815ffb4c33 100644 --- a/integration/network/inspect_test.go +++ b/integration/network/inspect_test.go @@ -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