test: Fix TestRetryOmit and TestStopBehavior (argoproj#3910)

highb · Sep 1, 2020 · c4c8006 · c4c8006
1 parent 650869f
commit c4c8006
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
@@ -134,7 +134,7 @@ jobs:
  ui:
  name: UI
  runs-on: ubuntu-latest
- timeout-minutes: 5
+ timeout-minutes: 8
  steps:
  - name: Checkout code
  uses: actions/checkout@v2

diff --git a/test/e2e/cli_test.go b/test/e2e/cli_test.go
@@ -1011,7 +1011,6 @@ func (s *CLIWithServerSuite) TestTemplateLevelSemaphore() {
 }
 
 func (s *CLISuite) TestRetryOmit() {
- s.T().Skip("flaky - see https://github.com/argoproj/argo/issues/3540")
  s.testNeedsOffloading()
  s.Given().
  Workflow("@testdata/retry-omit.yaml").
@@ -1022,6 +1021,7 @@ func (s *CLISuite) TestRetryOmit() {
  return node.Phase == wfv1.NodeOmitted
  })
  }), "any node omitted").
+ WaitForWorkflow(10*time.Second).
  Then().
  ExpectWorkflow(func(t *testing.T, metadata *metav1.ObjectMeta, status *wfv1.WorkflowStatus) {
  node := status.Nodes.FindByDisplayName("should-not-execute")

diff --git a/test/e2e/functional_test.go b/test/e2e/functional_test.go
@@ -468,7 +468,6 @@ func (s *FunctionalSuite) TestGlobalScope() {
 }
 
 func (s *FunctionalSuite) TestStopBehavior() {
- s.T().Skip("flaky - see https://github.com/argoproj/argo/issues/2833")
  s.Given().
  Workflow("@functional/stop-terminate.yaml").
  When().