From 9d41ea2d82cd0fed78d28cb3a047d0c889a6532c Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 2 Jan 2019 14:36:22 +0100 Subject: [PATCH] integration: wait for service update to be completed Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 8edcd4c3cd294bf276ffbe29bc58afbb006593b8) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 2ae0365c99627343d001a24e171fba2aa0fea791 Component: engine --- components/engine/integration/service/update_test.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/components/engine/integration/service/update_test.go b/components/engine/integration/service/update_test.go index 7e9e247e52..0fdc238fcf 100644 --- a/components/engine/integration/service/update_test.go +++ b/components/engine/integration/service/update_test.go @@ -207,10 +207,13 @@ func serviceIsUpdated(client client.ServiceAPIClient, serviceID string) func(log switch { case err != nil: return poll.Error(err) - case service.UpdateStatus == nil || service.UpdateStatus.State == swarmtypes.UpdateStateCompleted: + case service.UpdateStatus != nil && service.UpdateStatus.State == swarmtypes.UpdateStateCompleted: return poll.Success() default: - return poll.Continue("waiting for service %s to be updated, state: %s, message: %s", serviceID, service.UpdateStatus.State, service.UpdateStatus.Message) + if service.UpdateStatus != nil { + return poll.Continue("waiting for service %s to be updated, state: %s, message: %s", serviceID, service.UpdateStatus.State, service.UpdateStatus.Message) + } + return poll.Continue("waiting for service %s to be updated", serviceID) } } }