kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix staticcheck failures for vendor/k8s.io/apiserver/pkg/registry/rest/resttest 

Kubernetes-commit: 92ece853be2969fd8f9716434c8fb062e1ebef9b
This commit is contained in:
mozillazg 2021-04-17 16:07:19 +08:00 committed by Kubernetes Publisher
parent 2e076b8708
commit eca89e844c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/registry/rest/resttest/resttest.go
View File

@ -206,6 +206,8 @@ func (t *Tester) TestDelete(valid runtime.Object, createFn CreateFunc, getFn Get
t.testDeleteNoGraceful(valid.DeepCopyObject(), createFn, getFn, isNotFoundFn, false) t.testDeleteNoGraceful(valid.DeepCopyObject(), createFn, getFn, isNotFoundFn, false)
t.testDeleteWithUID(valid.DeepCopyObject(), createFn, getFn, isNotFoundFn, dryRunOpts) t.testDeleteWithUID(valid.DeepCopyObject(), createFn, getFn, isNotFoundFn, dryRunOpts)
t.testDeleteWithUID(valid.DeepCopyObject(), createFn, getFn, isNotFoundFn, opts) t.testDeleteWithUID(valid.DeepCopyObject(), createFn, getFn, isNotFoundFn, opts)
t.testDeleteWithResourceVersion(valid.DeepCopyObject(), createFn, getFn, isNotFoundFn, dryRunOpts)
t.testDeleteWithResourceVersion(valid.DeepCopyObject(), createFn, getFn, isNotFoundFn, opts)
} }
// Test gracefully deleting an object. // Test gracefully deleting an object.
@ -917,12 +919,16 @@ func (t *Tester) testDeleteWithResourceVersion(obj runtime.Object, createFn Crea
foo := obj.DeepCopyObject() foo := obj.DeepCopyObject()
t.setObjectMeta(foo, t.namer(1)) t.setObjectMeta(foo, t.namer(1))
objectMeta := t.getObjectMetaOrFail(foo)
objectMeta.SetResourceVersion("RV0000")
if err := createFn(ctx, foo); err != nil { if err := createFn(ctx, foo); err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
opts.Preconditions = metav1.NewRVDeletionPrecondition("RV1111").Preconditions newObj, err := getFn(ctx, foo)
if err != nil {
t.Errorf("unexpected error: %v", err)
}
objectMeta := t.getObjectMetaOrFail(newObj)
opts.Preconditions = metav1.NewRVDeletionPrecondition("wrongVersion").Preconditions
_, wasDeleted, err := t.storage.(rest.GracefulDeleter).Delete(ctx, objectMeta.GetName(), rest.ValidateAllObjectFunc, &opts) _, wasDeleted, err := t.storage.(rest.GracefulDeleter).Delete(ctx, objectMeta.GetName(), rest.ValidateAllObjectFunc, &opts)
if err == nil || !errors.IsConflict(err) { if err == nil || !errors.IsConflict(err) {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
@ -930,7 +936,7 @@ func (t *Tester) testDeleteWithResourceVersion(obj runtime.Object, createFn Crea
if wasDeleted { if wasDeleted {
t.Errorf("unexpected, object %s should not have been deleted immediately", objectMeta.GetName()) t.Errorf("unexpected, object %s should not have been deleted immediately", objectMeta.GetName())
} }
obj, _, err = t.storage.(rest.GracefulDeleter).Delete(ctx, objectMeta.GetName(), rest.ValidateAllObjectFunc, metav1.NewRVDeletionPrecondition("RV0000")) obj, _, err = t.storage.(rest.GracefulDeleter).Delete(ctx, objectMeta.GetName(), rest.ValidateAllObjectFunc, metav1.NewRVDeletionPrecondition(objectMeta.GetResourceVersion()))
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }