fix(test): TestWorkflowTemplateRefWithShutdownAndSuspend flakiness (#…

…5441)
argoproj · Mar 18, 2021 · 07ef0e6 · 07ef0e6
1 parent c16a471
commit 07ef0e6
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/workflow/controller/operator_workflow_template_ref_test.go b/workflow/controller/operator_workflow_template_ref_test.go
@@ -287,11 +287,12 @@ func TestWorkflowTemplateRefGetArtifactsFromTemplate(t *testing.T) {
 }
 
 func TestWorkflowTemplateRefWithShutdownAndSuspend(t *testing.T) {
-	cancel, controller := newController(unmarshalWF(wfWithTmplRef), unmarshalWFTmpl(wfTmpl))
-	defer cancel()
-	t.Run("EntrypointMissingInStoredWfSpec", func(t *testing.T) {
+	t.Run("EntryPointMissingInStoredWfSpec", func(t *testing.T) {
+		wf := unmarshalWF(wfWithTmplRef)
+		cancel, controller := newController(wf, unmarshalWFTmpl(wfTmpl))
+		defer cancel()
 		ctx := context.Background()
-		woc := newWorkflowOperationCtx(unmarshalWF(wfWithTmplRef), controller)
+		woc := newWorkflowOperationCtx(wf, controller)
 		woc.operate(ctx)
 		assert.Nil(t, woc.wf.Status.StoredWorkflowSpec.Suspend)
 		wf1 := woc.wf.DeepCopy()
@@ -305,8 +306,11 @@ func TestWorkflowTemplateRefWithShutdownAndSuspend(t *testing.T) {
 	})
 
 	t.Run("WorkflowTemplateRefWithSuspend", func(t *testing.T) {
+		wf := unmarshalWF(wfWithTmplRef)
+		cancel, controller := newController(wf, unmarshalWFTmpl(wfTmpl))
+		defer cancel()
 		ctx := context.Background()
-		woc := newWorkflowOperationCtx(unmarshalWF(wfWithTmplRef), controller)
+		woc := newWorkflowOperationCtx(wf, controller)
 		woc.operate(ctx)
 		assert.Nil(t, woc.wf.Status.StoredWorkflowSpec.Suspend)
 		wf1 := woc.wf.DeepCopy()
@@ -319,8 +323,11 @@ func TestWorkflowTemplateRefWithShutdownAndSuspend(t *testing.T) {
 		assert.True(t, *woc1.wf.Status.StoredWorkflowSpec.Suspend)
 	})
 	t.Run("WorkflowTemplateRefWithShutdownTerminate", func(t *testing.T) {
+		wf := unmarshalWF(wfWithTmplRef)
+		cancel, controller := newController(wf, unmarshalWFTmpl(wfTmpl))
+		defer cancel()
 		ctx := context.Background()
-		woc := newWorkflowOperationCtx(unmarshalWF(wfWithTmplRef), controller)
+		woc := newWorkflowOperationCtx(wf, controller)
 		woc.operate(ctx)
 		assert.Empty(t, woc.wf.Status.StoredWorkflowSpec.Shutdown)
 		wf1 := woc.wf.DeepCopy()
@@ -339,8 +346,11 @@ func TestWorkflowTemplateRefWithShutdownAndSuspend(t *testing.T) {
 		}
 	})
 	t.Run("WorkflowTemplateRefWithShutdownStop", func(t *testing.T) {
+		wf := unmarshalWF(wfWithTmplRef)
+		cancel, controller := newController(wf, unmarshalWFTmpl(wfTmpl))
+		defer cancel()
 		ctx := context.Background()
-		woc := newWorkflowOperationCtx(unmarshalWF(wfWithTmplRef), controller)
+		woc := newWorkflowOperationCtx(wf, controller)
 		woc.operate(ctx)
 		assert.Empty(t, woc.wf.Status.StoredWorkflowSpec.Shutdown)
 		wf1 := woc.wf.DeepCopy()