test: Fix TestDeletingRunningPod (argoproj#4996)

Signed-off-by: Alex Collins <[email protected]>
highb · Feb 2, 2021 · 61e8b96 · 61e8b96
1 parent 44a4f7e
commit 61e8b96
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/test/e2e/functional_test.go b/test/e2e/functional_test.go
@@ -56,8 +56,8 @@ func (s *FunctionalSuite) TestDeletingRunningPod() {
  When().
  SubmitWorkflow().
  WaitForWorkflow(fixtures.ToBeRunning, "to be running").
- Wait(10*time.Second). // be very sure the pod is actually running (not pending)
- Exec("kubectl", []string{"-n", "argo", "delete", "pod", "-l", "workflows.argoproj.io/workflow"}, fixtures.OutputRegexp(`pod "sleepy-.*" deleted`)).
+ Exec("kubectl", []string{"-n", "argo", "wait", "pod", "-l", "workflows.argoproj.io/completed=false", "--for=condition=Ready"}, fixtures.OutputRegexp(`pod/sleepy-.* condition met`)).
+ Exec("kubectl", []string{"-n", "argo", "delete", "pod", "-l", "workflows.argoproj.io/workflow", "--grace-period=1"}, fixtures.OutputRegexp(`pod "sleepy-.*" deleted`)).
  WaitForWorkflow().
  Then().
  ExpectWorkflow(func(t *testing.T, metadata *metav1.ObjectMeta, status *wfv1.WorkflowStatus) {

diff --git a/test/e2e/testdata/sleepy-workflow.yaml b/test/e2e/testdata/sleepy-workflow.yaml
@@ -12,4 +12,4 @@ spec:
  image: argoproj/argosay:v2
  args:
  - sleep
- - 30s
+ - 30s