fix: Account for batch event processing in e2e tests (argoproj#22356)

andrii-korotkov-verkada · PaulSonOfLars · commit 92bc7d19945a · 2025-03-22T14:50:19.000+01:00
Signed-off-by: Andrii Korotkov &lt;andrii.korotkov@verkada.com&gt;
diff --git a/Makefile b/Makefile
@@ -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
 
diff --git a/test/e2e/fixture/account/actions.go b/test/e2e/fixture/account/actions.go
@@ -1,6 +1,8 @@
 package project
 
 import (
+	"time"
+
 	"github.com/stretchr/testify/require"
 
 	"github.com/argoproj/argo-cd/v3/test/e2e/fixture"
@@ -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}
 }
diff --git a/test/e2e/fixture/account/consequences.go b/test/e2e/fixture/account/consequences.go
@@ -3,6 +3,7 @@ package project
 import (
 	"context"
 	"errors"
+	"time"
 
 	"github.com/stretchr/testify/require"
 
@@ -64,5 +65,6 @@ func (c *Consequences) Given() *Context {
 }
 
 func (c *Consequences) When() *Actions {
+	time.Sleep(fixture.WhenThenSleepInterval)
 	return c.actions
 }
diff --git a/test/e2e/fixture/account/context.go b/test/e2e/fixture/account/context.go
@@ -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"
@@ -45,5 +46,6 @@ func (c *Context) And(block func()) *Context {
 }
 
 func (c *Context) When() *Actions {
+	time.Sleep(fixture.WhenThenSleepInterval)
 	return &Actions{context: c}
 }
diff --git a/test/e2e/fixture/admin/actions.go b/test/e2e/fixture/admin/actions.go
@@ -1,6 +1,8 @@
 package admin
 
 import (
+	"time"
+
 	"github.com/argoproj/argo-cd/v3/test/e2e/fixture"
 )
 
@@ -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}
 }
diff --git a/test/e2e/fixture/admin/consequences.go b/test/e2e/fixture/admin/consequences.go
@@ -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"
 )
 
@@ -33,5 +36,6 @@ func (c *Consequences) Given() *Context {
 }
 
 func (c *Consequences) When() *Actions {
+	time.Sleep(fixture.WhenThenSleepInterval)
 	return c.actions
 }
diff --git a/test/e2e/fixture/admin/context.go b/test/e2e/fixture/admin/context.go
@@ -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"
@@ -39,5 +40,6 @@ func (c *Context) And(block func()) *Context {
 }
 
 func (c *Context) When() *Actions {
+	time.Sleep(fixture.WhenThenSleepInterval)
 	return &Actions{context: c}
 }
diff --git a/test/e2e/fixture/app/actions.go b/test/e2e/fixture/app/actions.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"slices"
 	"strconv"
+	"time"
 
 	rbacv1 "k8s.io/api/rbac/v1"
 
@@ -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}
 }
 
diff --git a/test/e2e/fixture/app/consequences.go b/test/e2e/fixture/app/consequences.go
@@ -101,6 +101,7 @@ func (c *Consequences) Given() *Context {
 }
 
 func (c *Consequences) When() *Actions {
+	time.Sleep(fixture.WhenThenSleepInterval)
 	return c.actions
 }
 
diff --git a/test/e2e/fixture/app/context.go b/test/e2e/fixture/app/context.go
@@ -349,6 +349,7 @@ func (c *Context) And(block func()) *Context {
 }
 
 func (c *Context) When() *Actions {
+	time.Sleep(fixture.WhenThenSleepInterval)
 	return &Actions{context: c}
 }
 
diff --git a/test/e2e/fixture/applicationsets/actions.go b/test/e2e/fixture/applicationsets/actions.go
@@ -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}
 }
 
diff --git a/test/e2e/fixture/applicationsets/consequences.go b/test/e2e/fixture/applicationsets/consequences.go
@@ -71,6 +71,7 @@ func (c *Consequences) Given() *Context {
 }
 
 func (c *Consequences) When() *Actions {
+	time.Sleep(fixture.WhenThenSleepInterval)
 	return c.actions
 }
 
diff --git a/test/e2e/fixture/applicationsets/context.go b/test/e2e/fixture/applicationsets/context.go
@@ -29,6 +29,7 @@ func Given(t *testing.T) *Context {
 }
 
 func (c *Context) When() *Actions {
+	time.Sleep(fixture.WhenThenSleepInterval)
 	return &Actions{context: c}
 }
 
diff --git a/test/e2e/fixture/cluster/actions.go b/test/e2e/fixture/cluster/actions.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"log"
 	"strings"
+	"time"
 
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
@@ -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}
 }
 
diff --git a/test/e2e/fixture/cluster/consequences.go b/test/e2e/fixture/cluster/consequences.go
@@ -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"
@@ -54,5 +55,6 @@ func (c *Consequences) Given() *Context {
 }
 
 func (c *Consequences) When() *Actions {
+	time.Sleep(fixture.WhenThenSleepInterval)
 	return c.actions
 }
diff --git a/test/e2e/fixture/cluster/context.go b/test/e2e/fixture/cluster/context.go
@@ -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"
@@ -59,6 +60,7 @@ func (c *Context) And(block func()) *Context {
 }
 
 func (c *Context) When() *Actions {
+	time.Sleep(fixture.WhenThenSleepInterval)
 	return &Actions{context: c}
 }
 
diff --git a/test/e2e/fixture/fixture.go b/test/e2e/fixture/fixture.go
@@ -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 (
diff --git a/test/e2e/fixture/notification/actions.go b/test/e2e/fixture/notification/actions.go
@@ -1,6 +1,8 @@
 package notification
 
 import (
+	"time"
+
 	"github.com/stretchr/testify/require"
 
 	"github.com/argoproj/argo-cd/v3/test/e2e/fixture"
@@ -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}
 }
 
diff --git a/test/e2e/fixture/notification/consequences.go b/test/e2e/fixture/notification/consequences.go
@@ -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"
@@ -53,6 +54,7 @@ func (c *Consequences) listTemplates() (*notification.TemplateList, error) {
 }
 
 func (c *Consequences) When() *Actions {
+	time.Sleep(fixture.WhenThenSleepInterval)
 	return c.actions
 }
 
diff --git a/test/e2e/fixture/notification/context.go b/test/e2e/fixture/notification/context.go
@@ -2,6 +2,7 @@ package notification
 
 import (
 	"testing"
+	"time"
 
 	"github.com/argoproj/argo-cd/v3/test/e2e/fixture"
 )
@@ -23,5 +24,6 @@ func (c *Context) And(block func()) *Context {
 }
 
 func (c *Context) When() *Actions {
+	time.Sleep(fixture.WhenThenSleepInterval)
 	return &Actions{context: c}
 }
diff --git a/test/e2e/fixture/project/actions.go b/test/e2e/fixture/project/actions.go
@@ -3,6 +3,7 @@ package project
 import (
 	"context"
 	"strings"
+	"time"
 
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -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}
 }
 
diff --git a/test/e2e/fixture/project/consequences.go b/test/e2e/fixture/project/consequences.go
@@ -2,6 +2,7 @@ package project
 
 import (
 	"context"
+	"time"
 
 	"github.com/argoproj/argo-cd/v3/pkg/apiclient/project"
 
@@ -43,5 +44,6 @@ func (c *Consequences) Given() *Context {
 }
 
 func (c *Consequences) When() *Actions {
+	time.Sleep(fixture.WhenThenSleepInterval)
 	return c.actions
 }
diff --git a/test/e2e/fixture/project/context.go b/test/e2e/fixture/project/context.go
@@ -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"
@@ -68,5 +69,6 @@ func (c *Context) And(block func()) *Context {
 }
 
 func (c *Context) When() *Actions {
+	time.Sleep(fixture.WhenThenSleepInterval)
 	return &Actions{context: c}
 }
diff --git a/test/e2e/fixture/repos/actions.go b/test/e2e/fixture/repos/actions.go
@@ -2,6 +2,7 @@ package repos
 
 import (
 	"log"
+	"time"
 
 	"github.com/argoproj/argo-cd/v3/test/e2e/fixture"
 )
@@ -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}
 }
 
diff --git a/test/e2e/fixture/repos/consequences.go b/test/e2e/fixture/repos/consequences.go
@@ -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"
@@ -54,5 +55,6 @@ func (c *Consequences) Given() *Context {
 }
 
 func (c *Consequences) When() *Actions {
+	time.Sleep(fixture.WhenThenSleepInterval)
 	return c.actions
 }
diff --git a/test/e2e/fixture/repos/context.go b/test/e2e/fixture/repos/context.go
@@ -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"
@@ -54,6 +55,7 @@ func (c *Context) And(block func()) *Context {
 }
 
 func (c *Context) When() *Actions {
+	time.Sleep(fixture.WhenThenSleepInterval)
 	return &Actions{context: c}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package project`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`	`"errors"`
	`6`	`+ "time"`
`6`	`7`
`7`	`8`	`"github.com/stretchr/testify/require"`
`8`	`9`
`@@ -64,5 +65,6 @@ func (c Consequences) Given() Context {`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`func (c Consequences) When() Actions {`
	`68`	`+ time.Sleep(fixture.WhenThenSleepInterval)`
`67`	`69`	`return c.actions`
`68`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package project`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
	`5`	`+ "time"`
`5`	`6`
`6`	`7`	`"github.com/argoproj/argo-cd/v3/test/e2e/fixture"`
`7`	`8`	`"github.com/argoproj/argo-cd/v3/util/env"`
`@@ -45,5 +46,6 @@ func (c Context) And(block func()) Context {`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`func (c Context) When() Actions {`
	`49`	`+ time.Sleep(fixture.WhenThenSleepInterval)`
`48`	`50`	`return &Actions{context: c}`
`49`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`package admin`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "time"`
	`5`	`+`
`4`	`6`	`"github.com/argoproj/argo-cd/v3/test/e2e/fixture"`
`5`	`7`	`)`
`6`	`8`
`@@ -63,5 +65,6 @@ func (a *Actions) runCliWithStdin(stdin string, args ...string) {`
`63`	`65`
`64`	`66`	`func (a Actions) Then() Consequences {`
`65`	`67`	`a.context.t.Helper()`
	`68`	`+ time.Sleep(fixture.WhenThenSleepInterval)`
`66`	`69`	`return &Consequences{a.context, a}`
`67`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,9 @@`
`1`	`1`	`package admin`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "time"`
	`5`	`+`
	`6`	`+ "github.com/argoproj/argo-cd/v3/test/e2e/fixture"`
`4`	`7`	`. "github.com/argoproj/argo-cd/v3/test/e2e/fixture/admin/utils"`
`5`	`8`	`)`
`6`	`9`
`@@ -33,5 +36,6 @@ func (c Consequences) Given() Context {`
`33`	`36`	`}`
`34`	`37`
`35`	`38`	`func (c Consequences) When() Actions {`
	`39`	`+ time.Sleep(fixture.WhenThenSleepInterval)`
`36`	`40`	`return c.actions`
`37`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package admin`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
	`5`	`+ "time"`
`5`	`6`
`6`	`7`	`"github.com/argoproj/argo-cd/v3/test/e2e/fixture"`
`7`	`8`	`"github.com/argoproj/argo-cd/v3/util/env"`
`@@ -39,5 +40,6 @@ func (c Context) And(block func()) Context {`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`func (c Context) When() Actions {`
	`43`	`+ time.Sleep(fixture.WhenThenSleepInterval)`
`42`	`44`	`return &Actions{context: c}`
`43`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,7 @@ func (c Consequences) Given() Context {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`func (c Consequences) When() Actions {`
	`104`	`+ time.Sleep(fixture.WhenThenSleepInterval)`
`104`	`105`	`return c.actions`
`105`	`106`	`}`
`106`	`107`
Original file line number	Diff line number	Diff line change
`@@ -349,6 +349,7 @@ func (c Context) And(block func()) Context {`
`349`	`349`	`}`
`350`	`350`
`351`	`351`	`func (c Context) When() Actions {`
	`352`	`+ time.Sleep(fixture.WhenThenSleepInterval)`
`352`	`353`	`return &Actions{context: c}`
`353`	`354`	`}`
`354`	`355`