fix: TestWorkflowLevelSemaphore flakiness (argoproj#3764)

test/e2e/cli_test.go

@@ -963,9 +963,12 @@ func (s *CLISuite) TestWorkflowLevelSemaphore() {
  }
  }).
  SubmitWorkflow().
- RunCli([]string{"get", "semaphore-wf-level"}, func(t *testing.T, output string, err error) {
- assert.Contains(t, output, "Waiting for")
+ RunCli([]string{"get", "semaphore-wf-level-1"}, func(t *testing.T, output string, err error) {
+ assert.Contains(t, output, "Running")
  }).
+ WaitForWorkflowCondition(func(wf *wfv1.Workflow) bool {
+ return wf.Status.Phase == ""
+ }, "Workflow is waiting for lock", 20*time.Second).
  WaitForWorkflow(30 * time.Second).
  DeleteConfigMap().
  Then().
@@ -985,11 +988,13 @@ func (s *CLISuite) TestTemplateLevelSemaphore() {
  When().
  CreateConfigMap("my-config", semaphoreData).
  SubmitWorkflow().
- Wait(12*time.Second).
+ WaitForWorkflowCondition(func(wf *wfv1.Workflow) bool {
+ return wf.Status.Phase == wfv1.NodeRunning
+ }, "waiting for Workflow to run", 10*time.Second).
  RunCli([]string{"get", "semaphore-tmpl-level"}, func(t *testing.T, output string, err error) {
  assert.Contains(t, output, "Waiting for")
  }).
- WaitForWorkflow(20 * time.Second).
+ WaitForWorkflow(30 * time.Second).
  DeleteConfigMap()
 }
 

test/e2e/cli_with_server_test.go

@@ -151,52 +151,6 @@ func (s *CLIWithServerSuite) TestArchive() {
  })
 }
 
-func (s *CLIWithServerSuite) TestWorkflowLevelSemaphore() {
- semaphoreData := map[string]string{
- "workflow": "1",
- }
- s.testNeedsOffloading()
- s.Given().
- Workflow("@testdata/semaphore-wf-level.yaml").
- When().
- CreateConfigMap("my-config", semaphoreData).
- RunCli([]string{"submit", "testdata/semaphore-wf-level-1.yaml"}, func(t *testing.T, output string, err error) {
- if assert.NoError(t, err) {
- assert.Contains(t, output, "semaphore-wf-level-1")
- }
- }).
- SubmitWorkflow().
- Wait(1*time.Second).
- RunCli([]string{"get", "semaphore-wf-level"}, func(t *testing.T, output string, err error) {
- assert.Contains(t, output, "Pending")
- }).
- WaitForWorkflow(30 * time.Second).
- DeleteConfigMap().
- Then().
- ExpectWorkflow(func(t *testing.T, _ *metav1.ObjectMeta, status *wfv1.WorkflowStatus) {
- assert.Equal(t, wfv1.NodeSucceeded, status.Phase)
- })
-}
-
-func (s *CLIWithServerSuite) TestTemplateLevelSemaphore() {
- semaphoreData := map[string]string{
- "template": "1",
- }
-
- s.testNeedsOffloading()
- s.Given().
- Workflow("@testdata/semaphore-tmpl-level.yaml").
- When().
- CreateConfigMap("my-config", semaphoreData).
- SubmitWorkflow().
- Wait(1*time.Second).
- RunCli([]string{"get", "semaphore-tmpl-level"}, func(t *testing.T, output string, err error) {
- assert.Contains(t, output, "Waiting for")
- }).
- WaitForWorkflow(20 * time.Second).
- DeleteConfigMap()
-}
-
 func (s *CLIWithServerSuite) TestArgoSetOutputs() {
  s.Given().
  Workflow(`