enable go-required check

my-git9 · my-git9 · commit d92c70b82693 · 2025-02-24T10:38:44.000+08:00
Signed-off-by: xin.li &lt;xin.li@daocloud.io&gt;
diff --git a/hack/golangci.yaml b/hack/golangci.yaml
@@ -277,5 +277,4 @@ linters-settings: # please keep this alphabetized
     enable-all: true
     disable:  # TODO: remove each disabled rule and fix it
       - float-compare
-      - go-require
       - require-error
diff --git a/hack/golangci.yaml.in b/hack/golangci.yaml.in
@@ -242,7 +242,6 @@ linters-settings: # please keep this alphabetized
     disable:  # TODO: remove each disabled rule and fix it
       {{- if .Base }}
       - float-compare
-      - go-require
       {{- end}}
       - require-error
     {{- end}}
diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/internal/generic/controller_test.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/internal/generic/controller_test.go
@@ -291,7 +291,7 @@ func TestInformerNeverStarts(t *testing.T) {
 	go func() {
 		defer wg.Done()
 		stopReason := myController.Run(testContext)
-		if !errors.Is(stopReason, context.Canceled) {
+		if !errors.Is(stopReason, context.DeadlineExceeded) {
 			t.Errorf("expected error to be context.Canceled, but got: %v", stopReason)
 		}
 	}()

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ func TestInformerNeverStarts(t *testing.T) {`
`291`	`291`	`go func() {`
`292`	`292`	`defer wg.Done()`
`293`	`293`	`stopReason := myController.Run(testContext)`
`294`		`- if !errors.Is(stopReason, context.Canceled) {`
	`294`	`+ if !errors.Is(stopReason, context.DeadlineExceeded) {`
`295`	`295`	`t.Errorf("expected error to be context.Canceled, but got: %v", stopReason)`
`296`	`296`	`}`
`297`	`297`	`}()`