Skip to content

OCPBUGS-113591: golangci-lint: enable ContextTodo/ContextBackground in usetesting #3138

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
andreaskaris wants to merge 3 commits into
base: master
Choose a base branch
from
Open

OCPBUGS-113591: golangci-lint: enable ContextTodo/ContextBackground in usetesting #3138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e7b7c8
golangci-lint: enable ContextTodo/ContextBackground in usetesting
andreaskaris Aug 24, 2026
14572e7
Fix lint issues for usetesting in pkg/apply
andreaskaris Aug 24, 2026
2311b5a
Fix lint issues for usetesting in proxyconfig, observability, bootstrap
andreaskaris Aug 24, 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: 4 additions & 0 deletions .golangci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ linters:
- unused
- usetesting
- wastedassign
settings:
usetesting:
context-background: true
context-todo: true
Comment thread
coderabbitai[bot] marked this conversation as resolved.
exclusions:
generated: lax
presets:
Expand Down
9 changes: 4 additions & 5 deletions pkg/apply/apply_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package apply

import (
"context"
"fmt"
"testing"

Expand Down Expand Up @@ -58,7 +57,7 @@ func TestApplyObjectPrePatchRunsBeforeSSA(t *testing.T) {
names.PrePatchAnnotation: prePatchValue,
})

err := ApplyObject(context.Background(), client, obj, "test-controller")
err := ApplyObject(t.Context(), client, obj, "test-controller")
g.Expect(err).To(Succeed())
g.Expect(patchTypes).To(HaveLen(2))
g.Expect(patchTypes[0]).To(Equal(types.StrategicMergePatchType), "pre-patch should be strategic-merge-patch")
Expand All @@ -81,7 +80,7 @@ func TestApplyObjectPrePatchNotFoundAllowsSSA(t *testing.T) {
names.PrePatchAnnotation: prePatchValue,
})

err := ApplyObject(context.Background(), client, obj, "test-controller")
err := ApplyObject(t.Context(), client, obj, "test-controller")
g.Expect(err).To(Succeed())
g.Expect(patchTypes).To(HaveLen(2))
g.Expect(patchTypes[0]).To(Equal(types.StrategicMergePatchType), "pre-patch was attempted")
Expand All @@ -103,7 +102,7 @@ func TestApplyObjectPrePatchErrorStopsReconciliation(t *testing.T) {
names.PrePatchAnnotation: prePatchValue,
})

err := ApplyObject(context.Background(), client, obj, "test-controller")
err := ApplyObject(t.Context(), client, obj, "test-controller")
g.Expect(err).To(HaveOccurred())
g.Expect(err.Error()).To(ContainSubstring("failed to pre-patch"))
g.Expect(patchTypes).To(HaveLen(1), "SSA apply should not have been reached")
Expand All @@ -123,7 +122,7 @@ func TestApplyObjectNoPrePatchAnnotationSkipsPrePatch(t *testing.T) {

obj := newTestDeployment(nil)

err := ApplyObject(context.Background(), client, obj, "test-controller")
err := ApplyObject(t.Context(), client, obj, "test-controller")
g.Expect(err).To(Succeed())
g.Expect(patchTypes).To(HaveLen(1))
g.Expect(patchTypes[0]).To(Equal(types.ApplyPatchType), "only SSA apply should have run")
Expand Down
Loading