Skip to content

Attempt at fixing flakey tests #4700

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

Open
hlipsig wants to merge 5 commits into
base: master
Choose a base branch
from
+4 −2
Open

Attempt at fixing flakey tests #4700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
deccbff
Attempt at fixing flakey tests
hlipsig Mar 19, 2026
37bacd3
Initial plan
Copilot Mar 20, 2026
7543a0a
Revert flakey test changes and increase SpecTimeout to 3 minutes
Copilot Mar 20, 2026
cf97afa
Update .bingo/go.mod
hlipsig Mar 20, 2026
b8451e7
Merge pull request #4701 from Azure/copilot/sub-pr-4700
hlipsig Mar 20, 2026
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
4 changes: 3 additions & 1 deletion .bingo/go.mod
View file
Open in desktop
Copy link
Copy Markdown
Member

@cadenmarchese cadenmarchese Mar 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the .bingo change is required, can we leave it to a new PR since this one is meant to fix the e2e flake?

Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
module _ // Fake go.mod auto-created by 'bingo' for go -moddir compatibility with non-Go projects. Commit this file, together with other .mod files.
module _ // Fake go.mod auto-created by 'bingo' for go -moddir compatibility with non-Go projects. Commit this file, together with other .mod files.

go 1.25.3
2 changes: 1 addition & 1 deletion test/e2e/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ var _ = Describe("ARO Operator - MUO Deployment", func() {

By("waiting for the MUO deployment to be reconciled")
GetK8sObjectWithRetry(ctx, getFunc, managedUpgradeOperatorDeployment, metav1.GetOptions{})
}, SpecTimeout(2*time.Minute))
}, SpecTimeout(3*time.Minute))
Copy link
Copy Markdown
Member

@cadenmarchese cadenmarchese Mar 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than specify a timeout for this specific test, can we leverage the Eventually() pattern like other tests, using the DefaultEventuallyTimeout at test/e2e/helpers.go, which is 5 minutes?

})

var _ = Describe("ARO Operator - ImageConfig Reconciler", func() {
Expand Down
Loading