From 94429d40787f0267fd515c80c332d800ee58b609 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 9 Jan 2019 13:28:04 +0100 Subject: [PATCH] Remove use of serviceSpecIsUpdated It's no longer needed with the latest swarmkit changes Signed-off-by: Sebastiaan van Stijn --- integration/service/update_test.go | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/integration/service/update_test.go b/integration/service/update_test.go index 4c1b94f8c0..0fdc238fcf 100644 --- a/integration/service/update_test.go +++ b/integration/service/update_test.go @@ -32,7 +32,7 @@ func TestServiceUpdateLabel(t *testing.T) { service.Spec.Labels["foo"] = "bar" _, err := cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, types.ServiceUpdateOptions{}) assert.NilError(t, err) - poll.WaitOn(t, serviceSpecIsUpdated(cli, serviceID, service.Version.Index), swarm.ServicePoll) + poll.WaitOn(t, serviceIsUpdated(cli, serviceID), swarm.ServicePoll) service = getService(t, cli, serviceID) assert.Check(t, is.DeepEqual(service.Spec.Labels, map[string]string{"foo": "bar"})) @@ -40,21 +40,21 @@ func TestServiceUpdateLabel(t *testing.T) { service.Spec.Labels["foo2"] = "bar" _, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, types.ServiceUpdateOptions{}) assert.NilError(t, err) - poll.WaitOn(t, serviceSpecIsUpdated(cli, serviceID, service.Version.Index), swarm.ServicePoll) + poll.WaitOn(t, serviceIsUpdated(cli, serviceID), swarm.ServicePoll) service = getService(t, cli, serviceID) assert.Check(t, is.DeepEqual(service.Spec.Labels, map[string]string{"foo": "bar", "foo2": "bar"})) delete(service.Spec.Labels, "foo2") _, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, types.ServiceUpdateOptions{}) assert.NilError(t, err) - poll.WaitOn(t, serviceSpecIsUpdated(cli, serviceID, service.Version.Index), swarm.ServicePoll) + poll.WaitOn(t, serviceIsUpdated(cli, serviceID), swarm.ServicePoll) service = getService(t, cli, serviceID) assert.Check(t, is.DeepEqual(service.Spec.Labels, map[string]string{"foo": "bar"})) delete(service.Spec.Labels, "foo") _, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, types.ServiceUpdateOptions{}) assert.NilError(t, err) - poll.WaitOn(t, serviceSpecIsUpdated(cli, serviceID, service.Version.Index), swarm.ServicePoll) + poll.WaitOn(t, serviceIsUpdated(cli, serviceID), swarm.ServicePoll) service = getService(t, cli, serviceID) assert.Check(t, is.DeepEqual(service.Spec.Labels, map[string]string{})) @@ -62,7 +62,7 @@ func TestServiceUpdateLabel(t *testing.T) { service.Spec.Labels["foo"] = "bar" _, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, types.ServiceUpdateOptions{}) assert.NilError(t, err) - poll.WaitOn(t, serviceSpecIsUpdated(cli, serviceID, service.Version.Index), swarm.ServicePoll) + poll.WaitOn(t, serviceIsUpdated(cli, serviceID), swarm.ServicePoll) service = getService(t, cli, serviceID) assert.Check(t, is.DeepEqual(service.Spec.Labels, map[string]string{"foo": "bar"})) @@ -217,17 +217,3 @@ func serviceIsUpdated(client client.ServiceAPIClient, serviceID string) func(log } } } - -func serviceSpecIsUpdated(client client.ServiceAPIClient, serviceID string, serviceOldVersion uint64) func(log poll.LogT) poll.Result { - return func(log poll.LogT) poll.Result { - service, _, err := client.ServiceInspectWithRaw(context.Background(), serviceID, types.ServiceInspectOptions{}) - switch { - case err != nil: - return poll.Error(err) - case service.Version.Index > serviceOldVersion: - return poll.Success() - default: - return poll.Continue("waiting for service %s to be updated", serviceID) - } - } -}