Skip to content

Fix EnsureCleanup to properly skip clean up when requested #16372

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
knative-prow merged 2 commits into from
Feb 9, 2026
Merged

Fix EnsureCleanup to properly skip clean up when requested #16372

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5abc32
Fix EnsureCleanup to properly skip clean up when requested
dprotaso Feb 6, 2026
20b72e7
skip cleanup for failed tests
dprotaso Feb 6, 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
15 changes: 10 additions & 5 deletions test/cleanup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,17 @@ func TearDown(clients *Clients, names *ResourceNames) {
// EnsureCleanup will run the provided cleanup function when the test ends,
// either via t.Cleanup or on interrupt via CleanupOnInterrupt.
func EnsureCleanup(t *testing.T, cleanup func()) {
if t.Failed() && ServingFlags.SkipCleanupOnFail {
t.Log("skipping cleanup")
return
f := func() {
if t.Failed() && ServingFlags.SkipCleanupOnFail {
t.Log("skipping cleanup")
return
}

cleanup()
}
t.Cleanup(cleanup)
CleanupOnInterrupt(cleanup)

t.Cleanup(f)
CleanupOnInterrupt(f)
}

// EnsureTearDown will delete created names when the test ends, either via
Expand Down
Loading