Skip to content

fix: Account for batch event processing in e2e tests (cherry-pick #22356) #23070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 21, 2025
Merged

fix: Account for batch event processing in e2e tests (cherry-pick #22356) #23070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,7 @@ start-e2e-local: mod-vendor-local dep-ui-local cli-local
ARGOCD_APPLICATIONSET_CONTROLLER_ALLOWED_SCM_PROVIDERS=http://127.0.0.1:8341,http://127.0.0.1:8342,http://127.0.0.1:8343,http://127.0.0.1:8344 \
ARGOCD_E2E_TEST=true \
ARGOCD_HYDRATOR_ENABLED=true \
ARGOCD_CLUSTER_CACHE_EVENTS_PROCESSING_INTERVAL=1ms \
goreman -f $(ARGOCD_PROCFILE) start ${ARGOCD_START}
ls -lrt /tmp/coverage

Expand Down
3 changes: 3 additions & 0 deletions test/e2e/fixture/account/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package project

import (
"time"

"github.com/stretchr/testify/require"

"github.com/argoproj/argo-cd/v3/test/e2e/fixture"
Expand Down Expand Up @@ -81,5 +83,6 @@ func (a *Actions) runCli(args ...string) {

func (a *Actions) Then() *Consequences {
a.context.t.Helper()
time.Sleep(fixture.WhenThenSleepInterval)
return &Consequences{a.context, a}
}
2 changes: 2 additions & 0 deletions test/e2e/fixture/account/consequences.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package project
import (
"context"
"errors"
"time"

"github.com/stretchr/testify/require"

Expand Down Expand Up @@ -64,5 +65,6 @@ func (c *Consequences) Given() *Context {
}

func (c *Consequences) When() *Actions {
time.Sleep(fixture.WhenThenSleepInterval)
return c.actions
}
2 changes: 2 additions & 0 deletions test/e2e/fixture/account/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package project

import (
"testing"
"time"

"github.com/argoproj/argo-cd/v3/test/e2e/fixture"
"github.com/argoproj/argo-cd/v3/util/env"
Expand Down Expand Up @@ -45,5 +46,6 @@ func (c *Context) And(block func()) *Context {
}

func (c *Context) When() *Actions {
time.Sleep(fixture.WhenThenSleepInterval)
return &Actions{context: c}
}
3 changes: 3 additions & 0 deletions test/e2e/fixture/admin/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package admin

import (
"time"

"github.com/argoproj/argo-cd/v3/test/e2e/fixture"
)

Expand Down Expand Up @@ -63,5 +65,6 @@ func (a *Actions) runCliWithStdin(stdin string, args ...string) {

func (a *Actions) Then() *Consequences {
a.context.t.Helper()
time.Sleep(fixture.WhenThenSleepInterval)
return &Consequences{a.context, a}
}
4 changes: 4 additions & 0 deletions test/e2e/fixture/admin/consequences.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package admin

import (
"time"

"github.com/argoproj/argo-cd/v3/test/e2e/fixture"
. "github.com/argoproj/argo-cd/v3/test/e2e/fixture/admin/utils"
)

Expand Down Expand Up @@ -33,5 +36,6 @@ func (c *Consequences) Given() *Context {
}

func (c *Consequences) When() *Actions {
time.Sleep(fixture.WhenThenSleepInterval)
return c.actions
}
2 changes: 2 additions & 0 deletions test/e2e/fixture/admin/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package admin

import (
"testing"
"time"

"github.com/argoproj/argo-cd/v3/test/e2e/fixture"
"github.com/argoproj/argo-cd/v3/util/env"
Expand Down Expand Up @@ -39,5 +40,6 @@ func (c *Context) And(block func()) *Context {
}

func (c *Context) When() *Actions {
time.Sleep(fixture.WhenThenSleepInterval)
return &Actions{context: c}
}
2 changes: 2 additions & 0 deletions test/e2e/fixture/app/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"os"
"slices"
"strconv"
"time"

rbacv1 "k8s.io/api/rbac/v1"

Expand Down Expand Up @@ -492,6 +493,7 @@ func (a *Actions) And(block func()) *Actions {

func (a *Actions) Then() *Consequences {
a.context.t.Helper()
time.Sleep(fixture.WhenThenSleepInterval)
return &Consequences{a.context, a, 15}
}

Expand Down
1 change: 1 addition & 0 deletions test/e2e/fixture/app/consequences.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ func (c *Consequences) Given() *Context {
}

func (c *Consequences) When() *Actions {
time.Sleep(fixture.WhenThenSleepInterval)
return c.actions
}

Expand Down
1 change: 1 addition & 0 deletions test/e2e/fixture/app/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,7 @@ func (c *Context) And(block func()) *Context {
}

func (c *Context) When() *Actions {
time.Sleep(fixture.WhenThenSleepInterval)
return &Actions{context: c}
}

Expand Down
1 change: 1 addition & 0 deletions test/e2e/fixture/applicationsets/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ func (a *Actions) And(block func()) *Actions {

func (a *Actions) Then() *Consequences {
a.context.t.Helper()
time.Sleep(fixture.WhenThenSleepInterval)
return &Consequences{a.context, a}
}

Expand Down
1 change: 1 addition & 0 deletions test/e2e/fixture/applicationsets/consequences.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ func (c *Consequences) Given() *Context {
}

func (c *Consequences) When() *Actions {
time.Sleep(fixture.WhenThenSleepInterval)
return c.actions
}

Expand Down
1 change: 1 addition & 0 deletions test/e2e/fixture/applicationsets/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ func Given(t *testing.T) *Context {
}

func (c *Context) When() *Actions {
time.Sleep(fixture.WhenThenSleepInterval)
return &Actions{context: c}
}

Expand Down
2 changes: 2 additions & 0 deletions test/e2e/fixture/cluster/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"errors"
"log"
"strings"
"time"

"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
Expand Down Expand Up @@ -131,6 +132,7 @@ func (a *Actions) DeleteByServer() *Actions {

func (a *Actions) Then() *Consequences {
a.context.t.Helper()
time.Sleep(fixture.WhenThenSleepInterval)
return &Consequences{a.context, a}
}

Expand Down
2 changes: 2 additions & 0 deletions test/e2e/fixture/cluster/consequences.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package cluster
import (
"context"
"errors"
"time"

clusterpkg "github.com/argoproj/argo-cd/v3/pkg/apiclient/cluster"
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
Expand Down Expand Up @@ -54,5 +55,6 @@ func (c *Consequences) Given() *Context {
}

func (c *Consequences) When() *Actions {
time.Sleep(fixture.WhenThenSleepInterval)
return c.actions
}
2 changes: 2 additions & 0 deletions test/e2e/fixture/cluster/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package cluster

import (
"testing"
"time"

"github.com/argoproj/argo-cd/v3/test/e2e/fixture"
"github.com/argoproj/argo-cd/v3/util/env"
Expand Down Expand Up @@ -59,6 +60,7 @@ func (c *Context) And(block func()) *Context {
}

func (c *Context) When() *Actions {
time.Sleep(fixture.WhenThenSleepInterval)
return &Actions{context: c}
}

Expand Down
3 changes: 3 additions & 0 deletions test/e2e/fixture/fixture.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ const (
PluginSockFilePath = "/app/config/plugin"

E2ETestPrefix = "e2e-test-"

// Account for batch events processing (set to 1ms in e2e tests)
WhenThenSleepInterval = 5 * time.Millisecond
)

const (
Expand Down
3 changes: 3 additions & 0 deletions test/e2e/fixture/notification/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package notification

import (
"time"

"github.com/stretchr/testify/require"

"github.com/argoproj/argo-cd/v3/test/e2e/fixture"
Expand All @@ -24,6 +26,7 @@ func (a *Actions) SetParamInNotificationConfigMap(key, value string) *Actions {

func (a *Actions) Then() *Consequences {
a.context.t.Helper()
time.Sleep(fixture.WhenThenSleepInterval)
return &Consequences{a.context, a}
}

Expand Down
2 changes: 2 additions & 0 deletions test/e2e/fixture/notification/consequences.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package notification

import (
"context"
"time"

"github.com/argoproj/argo-cd/v3/pkg/apiclient/notification"
"github.com/argoproj/argo-cd/v3/test/e2e/fixture"
Expand Down Expand Up @@ -53,6 +54,7 @@ func (c *Consequences) listTemplates() (*notification.TemplateList, error) {
}

func (c *Consequences) When() *Actions {
time.Sleep(fixture.WhenThenSleepInterval)
return c.actions
}

Expand Down
2 changes: 2 additions & 0 deletions test/e2e/fixture/notification/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package notification

import (
"testing"
"time"

"github.com/argoproj/argo-cd/v3/test/e2e/fixture"
)
Expand All @@ -23,5 +24,6 @@ func (c *Context) And(block func()) *Context {
}

func (c *Context) When() *Actions {
time.Sleep(fixture.WhenThenSleepInterval)
return &Actions{context: c}
}
2 changes: 2 additions & 0 deletions test/e2e/fixture/project/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package project
import (
"context"
"strings"
"time"

"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -112,6 +113,7 @@ func (a *Actions) And(block func()) *Actions {

func (a *Actions) Then() *Consequences {
a.context.t.Helper()
time.Sleep(fixture.WhenThenSleepInterval)
return &Consequences{a.context, a}
}

Expand Down
2 changes: 2 additions & 0 deletions test/e2e/fixture/project/consequences.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package project

import (
"context"
"time"

"github.com/argoproj/argo-cd/v3/pkg/apiclient/project"

Expand Down Expand Up @@ -43,5 +44,6 @@ func (c *Consequences) Given() *Context {
}

func (c *Consequences) When() *Actions {
time.Sleep(fixture.WhenThenSleepInterval)
return c.actions
}
2 changes: 2 additions & 0 deletions test/e2e/fixture/project/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package project

import (
"testing"
"time"

"github.com/argoproj/argo-cd/v3/test/e2e/fixture"
"github.com/argoproj/argo-cd/v3/util/env"
Expand Down Expand Up @@ -68,5 +69,6 @@ func (c *Context) And(block func()) *Context {
}

func (c *Context) When() *Actions {
time.Sleep(fixture.WhenThenSleepInterval)
return &Actions{context: c}
}
2 changes: 2 additions & 0 deletions test/e2e/fixture/repos/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package repos

import (
"log"
"time"

"github.com/argoproj/argo-cd/v3/test/e2e/fixture"
)
Expand Down Expand Up @@ -77,6 +78,7 @@ func (a *Actions) Project(project string) *Actions {

func (a *Actions) Then() *Consequences {
a.context.t.Helper()
time.Sleep(fixture.WhenThenSleepInterval)
return &Consequences{a.context, a}
}

Expand Down
2 changes: 2 additions & 0 deletions test/e2e/fixture/repos/consequences.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package repos
import (
"context"
"errors"
"time"

repositorypkg "github.com/argoproj/argo-cd/v3/pkg/apiclient/repository"
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
Expand Down Expand Up @@ -54,5 +55,6 @@ func (c *Consequences) Given() *Context {
}

func (c *Consequences) When() *Actions {
time.Sleep(fixture.WhenThenSleepInterval)
return c.actions
}
2 changes: 2 additions & 0 deletions test/e2e/fixture/repos/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package repos

import (
"testing"
"time"

"github.com/argoproj/argo-cd/v3/test/e2e/fixture"
"github.com/argoproj/argo-cd/v3/util/env"
Expand Down Expand Up @@ -54,6 +55,7 @@ func (c *Context) And(block func()) *Context {
}

func (c *Context) When() *Actions {
time.Sleep(fixture.WhenThenSleepInterval)
return &Actions{context: c}
}

Expand Down
Loading