From 28b7824caa9c8f1acc0471136a8a4fd80e51f491 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Sat, 12 Jan 2019 22:59:49 +0000 Subject: [PATCH] Remove code duplication and consolidate networkIsRemoved This fix removes code duplication and consolidates networkIsRemoved into one place. Signed-off-by: Yong Tang --- integration/internal/network/states.go | 20 ++++++++++++++++++++ integration/network/inspect_test.go | 12 +----------- integration/service/create_test.go | 18 ++++-------------- 3 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 integration/internal/network/states.go diff --git a/integration/internal/network/states.go b/integration/internal/network/states.go new file mode 100644 index 0000000000..1f00e0b80c --- /dev/null +++ b/integration/internal/network/states.go @@ -0,0 +1,20 @@ +package network + +import ( + "context" + + "github.com/docker/docker/api/types" + "github.com/docker/docker/client" + "gotest.tools/poll" +) + +// IsRemoved verifies the network is removed. +func IsRemoved(ctx context.Context, client client.NetworkAPIClient, networkID string) func(log poll.LogT) poll.Result { + return func(log poll.LogT) poll.Result { + _, err := client.NetworkInspect(ctx, networkID, types.NetworkInspectOptions{}) + if err == nil { + return poll.Continue("waiting for network %s to be removed", networkID) + } + return poll.Success() + } +} diff --git a/integration/network/inspect_test.go b/integration/network/inspect_test.go index 1e9ad94865..12ea884f2a 100644 --- a/integration/network/inspect_test.go +++ b/integration/network/inspect_test.go @@ -91,7 +91,7 @@ func TestInspectNetwork(t *testing.T) { err = client.NetworkRemove(context.Background(), overlayID) assert.NilError(t, err) - poll.WaitOn(t, networkIsRemoved(client, overlayID), poll.WithTimeout(1*time.Minute), poll.WithDelay(10*time.Second)) + poll.WaitOn(t, network.IsRemoved(context.Background(), client, overlayID), poll.WithTimeout(1*time.Minute), poll.WithDelay(10*time.Second)) } func serviceRunningTasksCount(client client.ServiceAPIClient, serviceID string, instances uint64) func(log poll.LogT) poll.Result { @@ -117,16 +117,6 @@ func serviceRunningTasksCount(client client.ServiceAPIClient, serviceID string, } } -func networkIsRemoved(client client.NetworkAPIClient, networkID string) func(log poll.LogT) poll.Result { - return func(log poll.LogT) poll.Result { - _, err := client.NetworkInspect(context.Background(), networkID, types.NetworkInspectOptions{}) - if err == nil { - return poll.Continue("waiting for network %s to be removed", networkID) - } - return poll.Success() - } -} - func serviceIsRemoved(client client.ServiceAPIClient, serviceID string) func(log poll.LogT) poll.Result { return func(log poll.LogT) poll.Result { filter := filters.NewArgs() diff --git a/integration/service/create_test.go b/integration/service/create_test.go index 8731ed4890..870353718c 100644 --- a/integration/service/create_test.go +++ b/integration/service/create_test.go @@ -122,7 +122,7 @@ func TestCreateServiceMultipleTimes(t *testing.T) { err = client.NetworkRemove(context.Background(), overlayID) assert.NilError(t, err) - poll.WaitOn(t, networkIsRemoved(client, overlayID), poll.WithTimeout(1*time.Minute), poll.WithDelay(10*time.Second)) + poll.WaitOn(t, network.IsRemoved(context.Background(), client, overlayID), poll.WithTimeout(1*time.Minute), poll.WithDelay(10*time.Second)) } func TestCreateServiceConflict(t *testing.T) { @@ -228,9 +228,9 @@ func TestCreateWithDuplicateNetworkNames(t *testing.T) { assert.NilError(t, err) // Make sure networks have been destroyed. - poll.WaitOn(t, networkIsRemoved(client, n3), poll.WithTimeout(1*time.Minute), poll.WithDelay(10*time.Second)) - poll.WaitOn(t, networkIsRemoved(client, n2), poll.WithTimeout(1*time.Minute), poll.WithDelay(10*time.Second)) - poll.WaitOn(t, networkIsRemoved(client, n1), poll.WithTimeout(1*time.Minute), poll.WithDelay(10*time.Second)) + poll.WaitOn(t, network.IsRemoved(context.Background(), client, n3), poll.WithTimeout(1*time.Minute), poll.WithDelay(10*time.Second)) + poll.WaitOn(t, network.IsRemoved(context.Background(), client, n2), poll.WithTimeout(1*time.Minute), poll.WithDelay(10*time.Second)) + poll.WaitOn(t, network.IsRemoved(context.Background(), client, n1), poll.WithTimeout(1*time.Minute), poll.WithDelay(10*time.Second)) } func TestCreateServiceSecretFileMode(t *testing.T) { @@ -513,13 +513,3 @@ func serviceIsRemoved(client client.ServiceAPIClient, serviceID string) func(log return poll.Success() } } - -func networkIsRemoved(client client.NetworkAPIClient, networkID string) func(log poll.LogT) poll.Result { - return func(log poll.LogT) poll.Result { - _, err := client.NetworkInspect(context.Background(), networkID, types.NetworkInspectOptions{}) - if err == nil { - return poll.Continue("waiting for network %s to be removed", networkID) - } - return poll.Success() - } -}