github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 11:38:15 +00:00
Code Issues Projects Releases Wiki Activity

lint

Browse Source 
Signed-off-by: Omer Aplatony <omerap12@gmail.com>
This commit is contained in:
Omer Aplatony 2024-12-14 17:13:40 +02:00
parent ed7f7ce92b
commit 7e578bdb6d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/apiextensions-apiserver/test/integration/validation_test.go
View File

@ -780,7 +780,8 @@ func TestCRValidationOnCRDUpdate(t *testing.T) {
// CR is now accepted // CR is now accepted
err = wait.PollUntilContextTimeout(context.Background(), 500*time.Millisecond, wait.ForeverTestTimeout, true, func(ctx context.Context) (done bool, err error) { err = wait.PollUntilContextTimeout(context.Background(), 500*time.Millisecond, wait.ForeverTestTimeout, true, func(ctx context.Context) (done bool, err error) {
_, createErr := noxuResourceClient.Create(ctx, instanceToCreate, metav1.CreateOptions{}) _, createErr := noxuResourceClient.Create(ctx, instanceToCreate, metav1.CreateOptions{})
if _, isStatus := createErr.(*apierrors.StatusError); isStatus { var statusErr *apierrors.StatusError
if errors.As(createErr, &statusErr) {
if apierrors.IsInvalid(createErr) { if apierrors.IsInvalid(createErr) {
return false, nil return false, nil
} }

10
staging/src/k8s.io/apiextensions-apiserver/test/integration/versioning_test.go
View File

@ -18,6 +18,7 @@ package integration
import ( import (
"context" "context"
stderrors "errors"
"fmt" "fmt"
"net/http" "net/http"
"reflect" "reflect"
@ -25,6 +26,7 @@ import (
"time" "time"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apiextensions-apiserver/test/integration/fixtures" "k8s.io/apiextensions-apiserver/test/integration/fixtures"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
@ -96,7 +98,8 @@ func TestInternalVersionIsHandlerVersion(t *testing.T) {
if patchErr != nil { if patchErr != nil {
// work around "grpc: the client connection is closing" error // work around "grpc: the client connection is closing" error
// TODO: fix the grpc error // TODO: fix the grpc error
if statusErr, ok := patchErr.(*errors.StatusError); ok && statusErr.Status().Code == http.StatusInternalServerError { var statusErr *errors.StatusError
if stderrors.As(patchErr, &statusErr) && statusErr.Status().Code == http.StatusInternalServerError {
return false, nil return false, nil
} }
return false, patchErr return false, patchErr
@ -116,11 +119,12 @@ func TestInternalVersionIsHandlerVersion(t *testing.T) {
i++ i++
_, patchErr := noxuNamespacedResourceClientV1beta2.Patch(ctx, "foo", types.MergePatchType, patch, metav1.PatchOptions{}) _, patchErr := noxuNamespacedResourceClientV1beta2.Patch(ctx, "foo", types.MergePatchType, patch, metav1.PatchOptions{})
assert.Error(t, patchErr) require.Error(t, patchErr)
// work around "grpc: the client connection is closing" error // work around "grpc: the client connection is closing" error
// TODO: fix the grpc error // TODO: fix the grpc error
if statusErr, ok := patchErr.(*errors.StatusError); ok && statusErr.Status().Code == http.StatusInternalServerError { var statusErr *errors.StatusError
if stderrors.As(patchErr, &statusErr) && statusErr.Status().Code == http.StatusInternalServerError {
return false, nil return false, nil
} }