Skip to content

fix: Hook should run before deleting resources #5185

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
zirain wants to merge 2 commits into
base: main
Choose a base branch
from
+10 −3
Open

fix: Hook should run before deleting resources #5185

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e71c57
fix: hook should be running before deleting resources
zirain Aug 19, 2026
9475b61
add comment
zirain Aug 23, 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
13 changes: 10 additions & 3 deletions conformance/utils/suite/suite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,13 +533,20 @@ func (suite *ConformanceTestSuite) Run(t *testing.T, tests []ConformanceTest) er
t.Run(test.ShortName, func(subT *testing.T) {
subT.Cleanup(func() {
suite.recordTestResult(subT, test, res)
if suite.Hook != nil {
suite.Hook(subT, test, suite)
}
})
err := suite.setClientsetForTest(test)
require.NoError(subT, err, "failed to create new clientset for test")
test.Run(subT, suite)
// Register the Hook's cleanup only after test.Run has returned, so it is
// the last cleanup registered on subT. testing.T runs Cleanup funcs in
// LIFO order, so this makes the Hook run before any cleanup the test
// itself registered during test.Run (e.g. deleting the resources it
// created), while resources are still present for the Hook to inspect.
if suite.Hook != nil {
subT.Cleanup(func() {
suite.Hook(subT, test, suite)
})
}
})

if res == testSucceeded {
Expand Down