From a388cad309edddb9880899fe8927afbe4717a18e Mon Sep 17 00:00:00 2001 From: Anshul Pundir Date: Fri, 23 Feb 2018 13:25:48 -0800 Subject: [PATCH] [manager/orchestrator/task_reaper] Fix task reaper test to also set the desired state on tasks to revent reconciliation races. Signed-off-by: Anshul Pundir --- manager/orchestrator/replicated/task_reaper_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manager/orchestrator/replicated/task_reaper_test.go b/manager/orchestrator/replicated/task_reaper_test.go index 35e034b9d4..f92831a582 100644 --- a/manager/orchestrator/replicated/task_reaper_test.go +++ b/manager/orchestrator/replicated/task_reaper_test.go @@ -493,9 +493,11 @@ func TestServiceRemoveDeadTasks(t *testing.T) { // Set both task states to RUNNING. updatedTask1 := observedTask1.Copy() + updatedTask1.DesiredState = api.TaskStateRunning updatedTask1.Status.State = api.TaskStateRunning updatedTask1.ServiceAnnotations = api.Annotations{Name: "original"} updatedTask2 := observedTask2.Copy() + updatedTask2.DesiredState = api.TaskStateRunning updatedTask2.Status.State = api.TaskStateRunning updatedTask2.ServiceAnnotations = api.Annotations{Name: "original"} err = s.Update(func(tx store.Tx) error { @@ -512,9 +514,11 @@ func TestServiceRemoveDeadTasks(t *testing.T) { // Set both tasks to COMPLETED. updatedTask3 := observedTask1.Copy() + updatedTask3.DesiredState = api.TaskStateCompleted updatedTask3.Status.State = api.TaskStateCompleted updatedTask3.ServiceAnnotations = api.Annotations{Name: "original"} updatedTask4 := observedTask2.Copy() + updatedTask4.DesiredState = api.TaskStateCompleted updatedTask4.Status.State = api.TaskStateCompleted updatedTask4.ServiceAnnotations = api.Annotations{Name: "original"} err = s.Update(func(tx store.Tx) error {