Resolve conflicts

argoproj · Apr 20, 2020 · ca77a5e · ca77a5e
1 parent dacfa20
commit ca77a5e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/workflow/controller/dag_test.go b/workflow/controller/dag_test.go
@@ -372,8 +372,7 @@ status:
 
 // Tests whether assessPhase marks a DAG as successful when it contains failed tasks with continueOn failed
 func TestDagAssessPhaseContinueOnExpandedTaskVariables(t *testing.T) {
-	cancel, controller := newController()
-	defer cancel()
+	controller := newController()
 	wfcset := controller.wfclientset.ArgoprojV1alpha1().Workflows("")
 
 	wf := unmarshalWF(dagAssessPhaseContinueOnExpandedTaskVariables)
@@ -593,8 +592,7 @@ status:
 
 // Tests whether assessPhase marks a DAG as successful when it contains failed tasks with continueOn failed
 func TestDagAssessPhaseContinueOnExpandedTask(t *testing.T) {
-	cancel, controller := newController()
-	defer cancel()
+	controller := newController()
 	wfcset := controller.wfclientset.ArgoprojV1alpha1().Workflows("")
 
 	wf := unmarshalWF(dagAssessPhaseContinueOnExpandedTask)

diff --git a/workflow/controller/operator.go b/workflow/controller/operator.go
@@ -792,11 +792,11 @@ func (woc *wfOperationCtx) podReconciliation() error {
 			// If the node is pending and the pod does not exist, it could be the case that we want to try to submit it
 			// again instead of marking it as an error. Check if that's the case.
 			if node.Pending() {
-				tmplCtx, err := woc.createTemplateContext(node.GetTemplateScope())
+				tmplCtx, err := woc.createTemplateContext(node.TemplateScope)
 				if err != nil {
 					return err
 				}
-				_, tmpl, _, err := tmplCtx.ResolveTemplate(&node)
+				_, tmpl, err := tmplCtx.ResolveTemplate(&node)
 				if err != nil {
 					return err
 				}