test(storage): improve object cleanup #8262
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Use the test helper mustDeleteObject function and make it resilient to transient failures. We should probably move other tests to do this at some point; could be a small fixit project. Fixes googleapis#8259
product-auto-label
bot
added
size: s
BrennaEpp
approved these changes
Jul 18, 2023
storage/integration_test.go
Outdated
| if apiErr.HTTPCode() == 404 || apiErr.GRPCStatus().Code() == codes.NotFound { | ||
| return | ||
| } | ||
| } | ||
| h.t.Fatalf("%s: delete object %s from bucket %s: %v", loc(), o.ObjectName(), o.BucketName(), err) |
There was a problem hiding this comment.
Since we're in here, maybe we should also update this to use t.Helper() instead of manually calling loc()? Maybe that change could be made as part of the fixit.
There was a problem hiding this comment.
Went ahead and just did this and got rid of loc()
| @@ -272,7 +272,9 @@ func multiTransportTest(ctx context.Context, t *testing.T, | |||
| opts ...option.ClientOption) { | |||
| for transport, client := range initTransportClients(ctx, t, opts...) { | |||
| t.Run(transport, func(t *testing.T) { | |||
| defer client.Close() | |||
| t.Cleanup(func() { | |||
| client.Close() | |||
There was a problem hiding this comment.
Yes, turns out this is necessary b/c defer calls run before t.Cleanup calls :)
product-auto-label
bot
added
size: m
tritone
added
the
automerge
gcf-merge-on-green
bot
removed
the
automerge
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use the test helper mustDeleteObject function and make it resilient to transient failures. Also switch to using t.Helper and t.Cleanup when possible for test helper funcs.
We should probably move other tests to do this at some point; could be a small fixit project.
Fixes #8259