test: Maybe fix TestPendingRetryWorkflowWithRetryStrategy. Fixes #2446 (

#2456)
argoproj · Mar 16, 2020 · 5346609 · 5346609
1 parent 3448ccf
commit 5346609
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/test/e2e/functional_test.go b/test/e2e/functional_test.go
@@ -227,12 +227,10 @@ spec:
 			b := wf.Status.Nodes.FindByDisplayName("b")
 			return wfv1.NodeSucceeded == a.Phase && wfv1.NodeSucceeded == b.Phase
 		}, "pods succeeded", 20*time.Second)
-	s.TearDownSuite()
 }
 
 // 128M is for argo executor
 func (s *FunctionalSuite) TestPendingRetryWorkflowWithRetryStrategy() {
-	s.T().SkipNow()
 	s.Given().
 		Workflow(`
 apiVersion: argoproj.io/v1alpha1
@@ -281,7 +279,6 @@ spec:
 			b := wf.Status.Nodes.FindByDisplayName("b(0)")
 			return wfv1.NodeSucceeded == a.Phase && wfv1.NodeSucceeded == b.Phase
 		}, "pods succeeded", 20*time.Second)
-	s.TearDownSuite()
 }
 
 func (s *FunctionalSuite) TestParameterAggregation() {

diff --git a/workflow/common/common.go b/workflow/common/common.go
@@ -62,7 +62,6 @@ const (
 	// LabelKeyWorkflowTemplate is a label applied to Workflows that are submitted from Workflowtemplate
 	LabelKeyWorkflowTemplate = workflow.WorkflowFullName + "/workflow-template"
 
-
 	// ExecutorArtifactBaseDir is the base directory in the init container in which artifacts will be copied to.
 	// Each artifact will be named according to its input name (e.g: /argo/inputs/artifacts/CODE)
 	ExecutorArtifactBaseDir = "/argo/inputs/artifacts"