diff --git a/hack/.golint_failures b/hack/.golint_failures index 8014e1ea08d..b5895160c36 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -1,4 +1,3 @@ - cluster/images/etcd-version-monitor cmd/gke-certificates-controller/app cmd/hyperkube @@ -579,6 +578,7 @@ staging/src/k8s.io/apiserver/pkg/features staging/src/k8s.io/apiserver/pkg/registry/generic staging/src/k8s.io/apiserver/pkg/registry/generic/registry staging/src/k8s.io/apiserver/pkg/registry/generic/rest +staging/src/k8s.io/apiserver/pkg/registry/generic/testing staging/src/k8s.io/apiserver/pkg/registry/rest staging/src/k8s.io/apiserver/pkg/registry/rest/resttest staging/src/k8s.io/apiserver/pkg/server diff --git a/pkg/registry/apps/controllerrevision/storage/BUILD b/pkg/registry/apps/controllerrevision/storage/BUILD index 52e8c8d438f..f7b406f21c8 100644 --- a/pkg/registry/apps/controllerrevision/storage/BUILD +++ b/pkg/registry/apps/controllerrevision/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/apps/controllerrevision/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/apps:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/registry/registrytest:go_default_library", @@ -20,6 +21,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], ) diff --git a/pkg/registry/apps/controllerrevision/storage/storage_test.go b/pkg/registry/apps/controllerrevision/storage/storage_test.go index a097fc2a2c2..e39614a1ee7 100644 --- a/pkg/registry/apps/controllerrevision/storage/storage_test.go +++ b/pkg/registry/apps/controllerrevision/storage/storage_test.go @@ -24,6 +24,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/apis/apps" @@ -35,7 +36,7 @@ func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) var ( valid = stripObjectMeta(newControllerRevision("validname", metav1.NamespaceDefault, newObject(), 0)) badRevision = stripObjectMeta(newControllerRevision("validname", "validns", newObject(), -1)) @@ -59,7 +60,7 @@ func TestUpdate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) addLabel := func(obj runtime.Object) runtime.Object { rev := obj.(*apps.ControllerRevision) @@ -94,7 +95,7 @@ func TestGet(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestGet(newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0)) } @@ -102,7 +103,7 @@ func TestList(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestList(newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0)) } @@ -110,7 +111,7 @@ func TestDelete(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestDelete(newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0)) } @@ -118,7 +119,7 @@ func TestWatch(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestWatch( newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0), []labels.Set{ diff --git a/pkg/registry/apps/statefulset/storage/BUILD b/pkg/registry/apps/statefulset/storage/BUILD index e9699e91199..29cecb9c03f 100644 --- a/pkg/registry/apps/statefulset/storage/BUILD +++ b/pkg/registry/apps/statefulset/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/apps/statefulset/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/apps:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/core:go_default_library", @@ -24,6 +25,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], diff --git a/pkg/registry/apps/statefulset/storage/storage_test.go b/pkg/registry/apps/statefulset/storage/storage_test.go index 4f96ba6ebea..3e635fbc13f 100644 --- a/pkg/registry/apps/statefulset/storage/storage_test.go +++ b/pkg/registry/apps/statefulset/storage/storage_test.go @@ -27,6 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/diff" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" "k8s.io/apiserver/pkg/registry/rest" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" @@ -94,7 +95,7 @@ func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.StatefulSet.Store.DestroyFunc() - test := registrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme) ps := validNewStatefulSet() ps.ObjectMeta = metav1.ObjectMeta{} test.TestCreate( @@ -147,7 +148,7 @@ func TestGet(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.StatefulSet.Store.DestroyFunc() - test := registrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme) test.TestGet(validNewStatefulSet()) } @@ -155,7 +156,7 @@ func TestList(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.StatefulSet.Store.DestroyFunc() - test := registrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme) test.TestList(validNewStatefulSet()) } @@ -163,7 +164,7 @@ func TestDelete(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.StatefulSet.Store.DestroyFunc() - test := registrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme) test.TestDelete(validNewStatefulSet()) } @@ -171,7 +172,7 @@ func TestWatch(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.StatefulSet.Store.DestroyFunc() - test := registrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme) test.TestWatch( validNewStatefulSet(), // matching labels diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD index 5b063c3c649..8d9f538753d 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/registry/registrytest:go_default_library", @@ -21,6 +22,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], ) diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go index 74703a6daab..6141cdb74f7 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go @@ -29,6 +29,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/registry/registrytest" ) @@ -75,7 +76,7 @@ func TestCreate(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) autoscaler := validNewHorizontalPodAutoscaler("foo") autoscaler.ObjectMeta = metav1.ObjectMeta{} test.TestCreate( @@ -90,7 +91,7 @@ func TestUpdate(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestUpdate( // valid validNewHorizontalPodAutoscaler("foo"), @@ -107,7 +108,7 @@ func TestDelete(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestDelete(validNewHorizontalPodAutoscaler("foo")) } @@ -115,7 +116,7 @@ func TestGet(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestGet(validNewHorizontalPodAutoscaler("foo")) } @@ -123,7 +124,7 @@ func TestList(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestList(validNewHorizontalPodAutoscaler("foo")) } @@ -131,7 +132,7 @@ func TestWatch(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestWatch( validNewHorizontalPodAutoscaler("foo"), // matching labels diff --git a/pkg/registry/batch/cronjob/storage/BUILD b/pkg/registry/batch/cronjob/storage/BUILD index e9a9934ed54..65b42407638 100644 --- a/pkg/registry/batch/cronjob/storage/BUILD +++ b/pkg/registry/batch/cronjob/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/batch/cronjob/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/core:go_default_library", @@ -22,6 +23,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], ) diff --git a/pkg/registry/batch/cronjob/storage/storage_test.go b/pkg/registry/batch/cronjob/storage/storage_test.go index dbf885e7415..4a489877daa 100644 --- a/pkg/registry/batch/cronjob/storage/storage_test.go +++ b/pkg/registry/batch/cronjob/storage/storage_test.go @@ -25,6 +25,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/api/testapi" @@ -74,7 +75,7 @@ func TestCreate(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) validCronJob := validNewCronJob() validCronJob.ObjectMeta = metav1.ObjectMeta{} test.TestCreate( @@ -96,7 +97,7 @@ func TestUpdate(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) schedule := "1 1 1 1 ?" test.TestUpdate( // valid @@ -125,7 +126,7 @@ func TestDelete(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestDelete(validNewCronJob()) } @@ -138,7 +139,7 @@ func TestGet(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestGet(validNewCronJob()) } @@ -151,7 +152,7 @@ func TestList(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestList(validNewCronJob()) } @@ -164,7 +165,7 @@ func TestWatch(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestWatch( validNewCronJob(), // matching labels diff --git a/pkg/registry/batch/job/storage/BUILD b/pkg/registry/batch/job/storage/BUILD index 35773420de8..6f4f81267b5 100644 --- a/pkg/registry/batch/job/storage/BUILD +++ b/pkg/registry/batch/job/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/batch/job/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/registry/registrytest:go_default_library", @@ -20,6 +21,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], ) diff --git a/pkg/registry/batch/job/storage/storage_test.go b/pkg/registry/batch/job/storage/storage_test.go index 8b468ac74ce..aecd3458f8e 100644 --- a/pkg/registry/batch/job/storage/storage_test.go +++ b/pkg/registry/batch/job/storage/storage_test.go @@ -24,6 +24,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/apis/batch" @@ -83,7 +84,7 @@ func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Job.Store.DestroyFunc() - test := registrytest.New(t, storage.Job.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme) validJob := validNewJob() validJob.ObjectMeta = metav1.ObjectMeta{} test.TestCreate( @@ -104,7 +105,7 @@ func TestUpdate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Job.Store.DestroyFunc() - test := registrytest.New(t, storage.Job.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme) two := int32(2) test.TestUpdate( // valid @@ -133,7 +134,7 @@ func TestDelete(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Job.Store.DestroyFunc() - test := registrytest.New(t, storage.Job.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme) test.TestDelete(validNewJob()) } @@ -141,7 +142,7 @@ func TestGet(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Job.Store.DestroyFunc() - test := registrytest.New(t, storage.Job.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme) test.TestGet(validNewJob()) } @@ -149,7 +150,7 @@ func TestList(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Job.Store.DestroyFunc() - test := registrytest.New(t, storage.Job.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme) test.TestList(validNewJob()) } @@ -157,7 +158,7 @@ func TestWatch(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Job.Store.DestroyFunc() - test := registrytest.New(t, storage.Job.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme) test.TestWatch( validNewJob(), // matching labels diff --git a/pkg/registry/core/configmap/storage/BUILD b/pkg/registry/core/configmap/storage/BUILD index b3d46baada9..13fea9fc766 100644 --- a/pkg/registry/core/configmap/storage/BUILD +++ b/pkg/registry/core/configmap/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/core/configmap/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/registry/registrytest:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -19,6 +20,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], ) diff --git a/pkg/registry/core/configmap/storage/storage_test.go b/pkg/registry/core/configmap/storage/storage_test.go index e83a40184df..c28c5bc438f 100644 --- a/pkg/registry/core/configmap/storage/storage_test.go +++ b/pkg/registry/core/configmap/storage/storage_test.go @@ -24,6 +24,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" @@ -61,7 +62,7 @@ func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) validConfigMap := validNewConfigMap() validConfigMap.ObjectMeta = metav1.ObjectMeta{ @@ -89,7 +90,7 @@ func TestUpdate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestUpdate( // valid validNewConfigMap(), @@ -112,7 +113,7 @@ func TestDelete(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestDelete(validNewConfigMap()) } @@ -120,7 +121,7 @@ func TestGet(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestGet(validNewConfigMap()) } @@ -128,7 +129,7 @@ func TestList(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestList(validNewConfigMap()) } @@ -136,7 +137,7 @@ func TestWatch(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestWatch( validNewConfigMap(), // matching labels diff --git a/pkg/registry/core/endpoint/storage/BUILD b/pkg/registry/core/endpoint/storage/BUILD index b71d8d68947..e5459253b4b 100644 --- a/pkg/registry/core/endpoint/storage/BUILD +++ b/pkg/registry/core/endpoint/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/core/endpoint/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/registry/registrytest:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -19,6 +20,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], ) diff --git a/pkg/registry/core/endpoint/storage/storage_test.go b/pkg/registry/core/endpoint/storage/storage_test.go index 56972e6fbcd..36668bad093 100644 --- a/pkg/registry/core/endpoint/storage/storage_test.go +++ b/pkg/registry/core/endpoint/storage/storage_test.go @@ -24,6 +24,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" @@ -68,7 +69,7 @@ func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) endpoints := validNewEndpoints() endpoints.ObjectMeta = metav1.ObjectMeta{} test.TestCreate( @@ -85,7 +86,7 @@ func TestUpdate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate() test.TestUpdate( // valid validNewEndpoints(), @@ -105,7 +106,7 @@ func TestDelete(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestDelete(validNewEndpoints()) } @@ -113,7 +114,7 @@ func TestGet(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestGet(validNewEndpoints()) } @@ -121,7 +122,7 @@ func TestList(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestList(validNewEndpoints()) } @@ -129,7 +130,7 @@ func TestWatch(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestWatch( validNewEndpoints(), // matching labels diff --git a/pkg/registry/core/event/storage/BUILD b/pkg/registry/core/event/storage/BUILD index 075af16a061..faebd244385 100644 --- a/pkg/registry/core/event/storage/BUILD +++ b/pkg/registry/core/event/storage/BUILD @@ -12,11 +12,13 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/core/event/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/registry/registrytest:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], ) diff --git a/pkg/registry/core/event/storage/storage_test.go b/pkg/registry/core/event/storage/storage_test.go index 56eebb185ca..a15e7840497 100644 --- a/pkg/registry/core/event/storage/storage_test.go +++ b/pkg/registry/core/event/storage/storage_test.go @@ -22,6 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" @@ -59,7 +60,7 @@ func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) event := validNewEvent(test.TestNamespace()) event.ObjectMeta = metav1.ObjectMeta{} test.TestCreate( @@ -74,7 +75,7 @@ func TestUpdate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate() test.TestUpdate( // valid validNewEvent(test.TestNamespace()), @@ -97,7 +98,7 @@ func TestDelete(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestDelete(validNewEvent(test.TestNamespace())) } diff --git a/pkg/registry/core/limitrange/storage/BUILD b/pkg/registry/core/limitrange/storage/BUILD index e00e18c4ce0..9128300e23e 100644 --- a/pkg/registry/core/limitrange/storage/BUILD +++ b/pkg/registry/core/limitrange/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/core/limitrange/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/registry/registrytest:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", @@ -20,6 +21,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], ) diff --git a/pkg/registry/core/limitrange/storage/storage_test.go b/pkg/registry/core/limitrange/storage/storage_test.go index 51e8a6ba7ef..bcffa960162 100644 --- a/pkg/registry/core/limitrange/storage/storage_test.go +++ b/pkg/registry/core/limitrange/storage/storage_test.go @@ -25,6 +25,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" @@ -70,7 +71,7 @@ func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).GeneratesName() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).GeneratesName() validLimitRange := validNewLimitRange() validLimitRange.ObjectMeta = metav1.ObjectMeta{} test.TestCreate( @@ -87,7 +88,7 @@ func TestUpdate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate() test.TestUpdate( // valid validNewLimitRange(), @@ -116,7 +117,7 @@ func TestDelete(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestDelete(validNewLimitRange()) } @@ -124,7 +125,7 @@ func TestGet(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestGet(validNewLimitRange()) } @@ -132,7 +133,7 @@ func TestList(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestList(validNewLimitRange()) } @@ -140,7 +141,7 @@ func TestWatch(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestWatch( validNewLimitRange(), // matching labels diff --git a/pkg/registry/core/namespace/storage/BUILD b/pkg/registry/core/namespace/storage/BUILD index 4699138d77c..38f7b76d350 100644 --- a/pkg/registry/core/namespace/storage/BUILD +++ b/pkg/registry/core/namespace/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/core/namespace/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/registry/registrytest:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -19,6 +20,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], diff --git a/pkg/registry/core/namespace/storage/storage_test.go b/pkg/registry/core/namespace/storage/storage_test.go index d033035a8c9..da514c1a1a8 100644 --- a/pkg/registry/core/namespace/storage/storage_test.go +++ b/pkg/registry/core/namespace/storage/storage_test.go @@ -24,6 +24,7 @@ import ( "k8s.io/apimachinery/pkg/labels" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" "k8s.io/apiserver/pkg/registry/rest" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" @@ -50,7 +51,7 @@ func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.store.DestroyFunc() - test := registrytest.New(t, storage.store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.store, legacyscheme.Scheme).ClusterScope() namespace := validNewNamespace() namespace.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"} test.TestCreate( @@ -94,7 +95,7 @@ func TestDelete(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.store.DestroyFunc() - test := registrytest.New(t, storage.store, legacyscheme.Scheme).ClusterScope().ReturnDeletedObject() + test := genericregistrytest.New(t, storage.store, legacyscheme.Scheme).ClusterScope().ReturnDeletedObject() test.TestDelete(validNewNamespace()) } @@ -102,7 +103,7 @@ func TestGet(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.store.DestroyFunc() - test := registrytest.New(t, storage.store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.store, legacyscheme.Scheme).ClusterScope() test.TestGet(validNewNamespace()) } @@ -110,7 +111,7 @@ func TestList(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.store.DestroyFunc() - test := registrytest.New(t, storage.store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.store, legacyscheme.Scheme).ClusterScope() test.TestList(validNewNamespace()) } @@ -118,7 +119,7 @@ func TestWatch(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.store.DestroyFunc() - test := registrytest.New(t, storage.store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.store, legacyscheme.Scheme).ClusterScope() test.TestWatch( validNewNamespace(), // matching labels diff --git a/pkg/registry/core/node/storage/BUILD b/pkg/registry/core/node/storage/BUILD index 41d3f227e53..a4c69983b41 100644 --- a/pkg/registry/core/node/storage/BUILD +++ b/pkg/registry/core/node/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/core/node/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/registry/registrytest:go_default_library", @@ -21,6 +22,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], ) diff --git a/pkg/registry/core/node/storage/storage_test.go b/pkg/registry/core/node/storage/storage_test.go index 6ed89bb0dfe..7bfca51a1ef 100644 --- a/pkg/registry/core/node/storage/storage_test.go +++ b/pkg/registry/core/node/storage/storage_test.go @@ -25,6 +25,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" @@ -71,7 +72,7 @@ func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() node := validNewNode() node.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"} test.TestCreate( @@ -88,7 +89,7 @@ func TestUpdate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestUpdate( // valid validNewNode(), @@ -105,7 +106,7 @@ func TestDelete(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestDelete(validNewNode()) } @@ -113,7 +114,7 @@ func TestGet(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestGet(validNewNode()) } @@ -121,7 +122,7 @@ func TestList(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestList(validNewNode()) } @@ -129,7 +130,7 @@ func TestWatch(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestWatch( validNewNode(), // matching labels diff --git a/pkg/registry/core/persistentvolume/storage/BUILD b/pkg/registry/core/persistentvolume/storage/BUILD index 76edbdfb6ea..236864fc315 100644 --- a/pkg/registry/core/persistentvolume/storage/BUILD +++ b/pkg/registry/core/persistentvolume/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/core/persistentvolume/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/registry/registrytest:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library", @@ -23,6 +24,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], diff --git a/pkg/registry/core/persistentvolume/storage/storage_test.go b/pkg/registry/core/persistentvolume/storage/storage_test.go index 479936a58de..61391ab6b59 100644 --- a/pkg/registry/core/persistentvolume/storage/storage_test.go +++ b/pkg/registry/core/persistentvolume/storage/storage_test.go @@ -28,6 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/diff" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" "k8s.io/apiserver/pkg/registry/rest" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" @@ -86,7 +87,7 @@ func TestCreate(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() pv := validNewPersistentVolume("foo") pv.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"} test.TestCreate( @@ -103,7 +104,7 @@ func TestUpdate(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestUpdate( // valid validNewPersistentVolume("foo"), @@ -122,7 +123,7 @@ func TestDelete(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope().ReturnDeletedObject() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope().ReturnDeletedObject() test.TestDelete(validNewPersistentVolume("foo")) } @@ -130,7 +131,7 @@ func TestGet(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestGet(validNewPersistentVolume("foo")) } @@ -138,7 +139,7 @@ func TestList(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestList(validNewPersistentVolume("foo")) } @@ -146,7 +147,7 @@ func TestWatch(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestWatch( validNewPersistentVolume("foo"), // matching labels diff --git a/pkg/registry/core/persistentvolumeclaim/storage/BUILD b/pkg/registry/core/persistentvolumeclaim/storage/BUILD index 078c72d0e69..db3d2dbe6bc 100644 --- a/pkg/registry/core/persistentvolumeclaim/storage/BUILD +++ b/pkg/registry/core/persistentvolumeclaim/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/core/persistentvolumeclaim/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/registry/registrytest:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library", @@ -23,6 +24,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], diff --git a/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go b/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go index fe5bad2fe61..b7ccfed7a68 100644 --- a/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go +++ b/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go @@ -28,6 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/diff" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" "k8s.io/apiserver/pkg/registry/rest" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" @@ -72,7 +73,7 @@ func TestCreate(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) pv := validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault) pv.ObjectMeta = metav1.ObjectMeta{} test.TestCreate( @@ -89,7 +90,7 @@ func TestUpdate(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestUpdate( // valid validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault), @@ -106,7 +107,7 @@ func TestDelete(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ReturnDeletedObject() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ReturnDeletedObject() test.TestDelete(validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault)) } @@ -114,7 +115,7 @@ func TestGet(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestGet(validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault)) } @@ -122,7 +123,7 @@ func TestList(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestList(validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault)) } @@ -130,7 +131,7 @@ func TestWatch(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestWatch( validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault), // matching labels diff --git a/pkg/registry/core/pod/storage/BUILD b/pkg/registry/core/pod/storage/BUILD index 3284982eb91..efe6ce10379 100644 --- a/pkg/registry/core/pod/storage/BUILD +++ b/pkg/registry/core/pod/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/core/pod/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/securitycontext:go_default_library", @@ -28,6 +29,7 @@ go_test( "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library", "//vendor/k8s.io/apiserver/pkg/features:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/errors:go_default_library", diff --git a/pkg/registry/core/pod/storage/storage_test.go b/pkg/registry/core/pod/storage/storage_test.go index 279d3d80272..cb91e2e51c1 100644 --- a/pkg/registry/core/pod/storage/storage_test.go +++ b/pkg/registry/core/pod/storage/storage_test.go @@ -34,6 +34,7 @@ import ( genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/features" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" "k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/storage" storeerr "k8s.io/apiserver/pkg/storage/errors" @@ -99,7 +100,7 @@ func TestCreate(t *testing.T) { storage, _, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) pod := validNewPod() pod.ObjectMeta = metav1.ObjectMeta{} // Make an invalid pod with an an incorrect label. @@ -126,7 +127,7 @@ func TestUpdate(t *testing.T) { storage, _, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestUpdate( // valid validNewPod(), @@ -143,7 +144,7 @@ func TestDelete(t *testing.T) { storage, _, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ReturnDeletedObject() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ReturnDeletedObject() test.TestDelete(validNewPod()) scheduledPod := validNewPod() @@ -367,7 +368,7 @@ func TestGet(t *testing.T) { storage, _, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestGet(validNewPod()) } @@ -375,7 +376,7 @@ func TestList(t *testing.T) { storage, _, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestList(validNewPod()) } @@ -383,7 +384,7 @@ func TestWatch(t *testing.T) { storage, _, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestWatch( validNewPod(), // matching labels diff --git a/pkg/registry/core/podtemplate/storage/BUILD b/pkg/registry/core/podtemplate/storage/BUILD index 8c4553aeeaf..8e82c79b77f 100644 --- a/pkg/registry/core/podtemplate/storage/BUILD +++ b/pkg/registry/core/podtemplate/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/core/podtemplate/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/registry/registrytest:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -19,6 +20,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], ) diff --git a/pkg/registry/core/podtemplate/storage/storage_test.go b/pkg/registry/core/podtemplate/storage/storage_test.go index 1fb0f6c8931..466e0499f39 100644 --- a/pkg/registry/core/podtemplate/storage/storage_test.go +++ b/pkg/registry/core/podtemplate/storage/storage_test.go @@ -24,6 +24,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" @@ -73,7 +74,7 @@ func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) pod := validNewPodTemplate("foo") pod.ObjectMeta = metav1.ObjectMeta{} test.TestCreate( @@ -90,7 +91,7 @@ func TestUpdate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestUpdate( //valid validNewPodTemplate("foo"), @@ -107,7 +108,7 @@ func TestDelete(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ReturnDeletedObject() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ReturnDeletedObject() test.TestDelete(validNewPodTemplate("foo")) } @@ -115,7 +116,7 @@ func TestGet(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestGet(validNewPodTemplate("foo")) } @@ -123,7 +124,7 @@ func TestList(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestList(validNewPodTemplate("foo")) } @@ -131,7 +132,7 @@ func TestWatch(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestWatch( validNewPodTemplate("foo"), // matching labels diff --git a/pkg/registry/core/replicationcontroller/storage/BUILD b/pkg/registry/core/replicationcontroller/storage/BUILD index 513924edf3c..f3bbbb8c31b 100644 --- a/pkg/registry/core/replicationcontroller/storage/BUILD +++ b/pkg/registry/core/replicationcontroller/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/core/replicationcontroller/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/registry/registrytest:go_default_library", @@ -24,6 +25,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], diff --git a/pkg/registry/core/replicationcontroller/storage/storage_test.go b/pkg/registry/core/replicationcontroller/storage/storage_test.go index 60e08d6bbae..de730aefacd 100644 --- a/pkg/registry/core/replicationcontroller/storage/storage_test.go +++ b/pkg/registry/core/replicationcontroller/storage/storage_test.go @@ -28,6 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/diff" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" "k8s.io/apiserver/pkg/registry/rest" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" @@ -99,7 +100,7 @@ func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Controller.Store.DestroyFunc() - test := registrytest.New(t, storage.Controller.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Controller.Store, legacyscheme.Scheme) controller := validNewController() controller.ObjectMeta = metav1.ObjectMeta{} test.TestCreate( @@ -120,7 +121,7 @@ func TestUpdate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Controller.Store.DestroyFunc() - test := registrytest.New(t, storage.Controller.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Controller.Store, legacyscheme.Scheme) test.TestUpdate( // valid validNewController(), @@ -148,7 +149,7 @@ func TestDelete(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Controller.Store.DestroyFunc() - test := registrytest.New(t, storage.Controller.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Controller.Store, legacyscheme.Scheme) test.TestDelete(validNewController()) } @@ -207,7 +208,7 @@ func TestGet(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Controller.Store.DestroyFunc() - test := registrytest.New(t, storage.Controller.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Controller.Store, legacyscheme.Scheme) test.TestGet(validNewController()) } @@ -215,7 +216,7 @@ func TestList(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Controller.Store.DestroyFunc() - test := registrytest.New(t, storage.Controller.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Controller.Store, legacyscheme.Scheme) test.TestList(validNewController()) } @@ -223,7 +224,7 @@ func TestWatch(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Controller.Store.DestroyFunc() - test := registrytest.New(t, storage.Controller.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Controller.Store, legacyscheme.Scheme) test.TestWatch( validController, // matching labels diff --git a/pkg/registry/core/resourcequota/storage/BUILD b/pkg/registry/core/resourcequota/storage/BUILD index 0ca8b417b0c..f60dd7f1a2c 100644 --- a/pkg/registry/core/resourcequota/storage/BUILD +++ b/pkg/registry/core/resourcequota/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/core/resourcequota/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/registry/registrytest:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library", @@ -22,6 +23,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], diff --git a/pkg/registry/core/resourcequota/storage/storage_test.go b/pkg/registry/core/resourcequota/storage/storage_test.go index 81a2d8f040e..fedfea279e8 100644 --- a/pkg/registry/core/resourcequota/storage/storage_test.go +++ b/pkg/registry/core/resourcequota/storage/storage_test.go @@ -27,6 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/diff" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" "k8s.io/apiserver/pkg/registry/rest" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" @@ -69,7 +70,7 @@ func TestCreate(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) resourcequota := validNewResourceQuota() resourcequota.ObjectMeta = metav1.ObjectMeta{} test.TestCreate( @@ -110,7 +111,7 @@ func TestDelete(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ReturnDeletedObject() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ReturnDeletedObject() test.TestDelete(validNewResourceQuota()) } @@ -118,7 +119,7 @@ func TestGet(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestGet(validNewResourceQuota()) } @@ -126,7 +127,7 @@ func TestList(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestList(validNewResourceQuota()) } @@ -134,7 +135,7 @@ func TestWatch(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestWatch( validNewResourceQuota(), // matching labels diff --git a/pkg/registry/core/secret/storage/BUILD b/pkg/registry/core/secret/storage/BUILD index ec91be84d8a..56447614041 100644 --- a/pkg/registry/core/secret/storage/BUILD +++ b/pkg/registry/core/secret/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/core/secret/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/registry/registrytest:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -19,6 +20,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], ) diff --git a/pkg/registry/core/secret/storage/storage_test.go b/pkg/registry/core/secret/storage/storage_test.go index c2374e680ff..07036f5c0b1 100644 --- a/pkg/registry/core/secret/storage/storage_test.go +++ b/pkg/registry/core/secret/storage/storage_test.go @@ -24,6 +24,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" @@ -57,7 +58,7 @@ func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) secret := validNewSecret("foo") secret.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo-"} test.TestCreate( @@ -80,7 +81,7 @@ func TestUpdate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestUpdate( // valid validNewSecret("foo"), @@ -97,7 +98,7 @@ func TestDelete(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestDelete(validNewSecret("foo")) } @@ -105,7 +106,7 @@ func TestGet(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestGet(validNewSecret("foo")) } @@ -113,7 +114,7 @@ func TestList(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestList(validNewSecret("foo")) } @@ -121,7 +122,7 @@ func TestWatch(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestWatch( validNewSecret("foo"), // matching labels diff --git a/pkg/registry/core/service/storage/BUILD b/pkg/registry/core/service/storage/BUILD index 46a72fcd6a6..9fa16864c89 100644 --- a/pkg/registry/core/service/storage/BUILD +++ b/pkg/registry/core/service/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/core/service/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/registry/registrytest:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -20,6 +21,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], ) diff --git a/pkg/registry/core/service/storage/storage_test.go b/pkg/registry/core/service/storage/storage_test.go index ba62b53033f..5102435522c 100644 --- a/pkg/registry/core/service/storage/storage_test.go +++ b/pkg/registry/core/service/storage/storage_test.go @@ -25,6 +25,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" @@ -67,7 +68,7 @@ func TestCreate(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) validService := validService() validService.ObjectMeta = metav1.ObjectMeta{} test.TestCreate( @@ -98,7 +99,7 @@ func TestUpdate(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate() test.TestUpdate( // valid validService(), @@ -125,7 +126,7 @@ func TestDelete(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate() test.TestDelete(validService()) } @@ -133,7 +134,7 @@ func TestGet(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate() test.TestGet(validService()) } @@ -141,7 +142,7 @@ func TestList(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate() test.TestList(validService()) } @@ -149,7 +150,7 @@ func TestWatch(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestWatch( validService(), // matching labels diff --git a/pkg/registry/core/serviceaccount/storage/BUILD b/pkg/registry/core/serviceaccount/storage/BUILD index 039b3efb6a9..5a8b0efcac8 100644 --- a/pkg/registry/core/serviceaccount/storage/BUILD +++ b/pkg/registry/core/serviceaccount/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/core/serviceaccount/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/registry/registrytest:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -19,6 +20,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], ) diff --git a/pkg/registry/core/serviceaccount/storage/storage_test.go b/pkg/registry/core/serviceaccount/storage/storage_test.go index 3bfc541337c..3dda4ba67b0 100644 --- a/pkg/registry/core/serviceaccount/storage/storage_test.go +++ b/pkg/registry/core/serviceaccount/storage/storage_test.go @@ -24,6 +24,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" @@ -55,7 +56,7 @@ func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) serviceAccount := validNewServiceAccount("foo") serviceAccount.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo-"} test.TestCreate( @@ -73,7 +74,7 @@ func TestUpdate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestUpdate( // valid validNewServiceAccount("foo"), @@ -90,7 +91,7 @@ func TestDelete(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ReturnDeletedObject() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ReturnDeletedObject() test.TestDelete(validNewServiceAccount("foo")) } @@ -98,7 +99,7 @@ func TestGet(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestGet(validNewServiceAccount("foo")) } @@ -106,7 +107,7 @@ func TestList(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestList(validNewServiceAccount("foo")) } @@ -114,7 +115,7 @@ func TestWatch(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestWatch( validNewServiceAccount("foo"), // matching labels diff --git a/pkg/registry/extensions/daemonset/storage/BUILD b/pkg/registry/extensions/daemonset/storage/BUILD index 2d53cd28d39..c4d9e6c388b 100644 --- a/pkg/registry/extensions/daemonset/storage/BUILD +++ b/pkg/registry/extensions/daemonset/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/registry/registrytest:go_default_library", @@ -20,6 +21,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], ) diff --git a/pkg/registry/extensions/daemonset/storage/storage_test.go b/pkg/registry/extensions/daemonset/storage/storage_test.go index 3f7d711bf81..f4410b46775 100644 --- a/pkg/registry/extensions/daemonset/storage/storage_test.go +++ b/pkg/registry/extensions/daemonset/storage/storage_test.go @@ -24,6 +24,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" @@ -81,7 +82,7 @@ func TestCreate(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) ds := newValidDaemonSet() ds.ObjectMeta = metav1.ObjectMeta{} test.TestCreate( @@ -108,7 +109,7 @@ func TestUpdate(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestUpdate( // valid newValidDaemonSet(), @@ -137,7 +138,7 @@ func TestDelete(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestDelete(newValidDaemonSet()) } @@ -145,7 +146,7 @@ func TestGet(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestGet(newValidDaemonSet()) } @@ -153,7 +154,7 @@ func TestList(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestList(newValidDaemonSet()) } @@ -161,7 +162,7 @@ func TestWatch(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestWatch( validDaemonSet, // matching labels diff --git a/pkg/registry/extensions/deployment/storage/BUILD b/pkg/registry/extensions/deployment/storage/BUILD index 3276c7105bf..0c0551c176d 100644 --- a/pkg/registry/extensions/deployment/storage/BUILD +++ b/pkg/registry/extensions/deployment/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/apis/extensions:go_default_library", @@ -26,6 +27,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/errors:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", diff --git a/pkg/registry/extensions/deployment/storage/storage_test.go b/pkg/registry/extensions/deployment/storage/storage_test.go index 8640b3e73a3..c7724eec9f8 100644 --- a/pkg/registry/extensions/deployment/storage/storage_test.go +++ b/pkg/registry/extensions/deployment/storage/storage_test.go @@ -31,6 +31,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" "k8s.io/apiserver/pkg/registry/rest" storeerr "k8s.io/apiserver/pkg/storage/errors" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" @@ -99,7 +100,7 @@ func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Deployment.Store.DestroyFunc() - test := registrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme) deployment := validNewDeployment() deployment.ObjectMeta = metav1.ObjectMeta{} test.TestCreate( @@ -119,7 +120,7 @@ func TestUpdate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Deployment.Store.DestroyFunc() - test := registrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme) test.TestUpdate( // valid validNewDeployment(), @@ -152,7 +153,7 @@ func TestDelete(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Deployment.Store.DestroyFunc() - test := registrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme) test.TestDelete(validNewDeployment()) } @@ -160,7 +161,7 @@ func TestGet(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Deployment.Store.DestroyFunc() - test := registrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme) test.TestGet(validNewDeployment()) } @@ -168,7 +169,7 @@ func TestList(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Deployment.Store.DestroyFunc() - test := registrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme) test.TestList(validNewDeployment()) } @@ -176,7 +177,7 @@ func TestWatch(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Deployment.Store.DestroyFunc() - test := registrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme) test.TestWatch( validNewDeployment(), // matching labels diff --git a/pkg/registry/extensions/ingress/storage/BUILD b/pkg/registry/extensions/ingress/storage/BUILD index 76c38551514..b3571218e89 100644 --- a/pkg/registry/extensions/ingress/storage/BUILD +++ b/pkg/registry/extensions/ingress/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/extensions/ingress/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/registry/registrytest:go_default_library", @@ -21,6 +22,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], ) diff --git a/pkg/registry/extensions/ingress/storage/storage_test.go b/pkg/registry/extensions/ingress/storage/storage_test.go index ac49ce32da9..75428128214 100644 --- a/pkg/registry/extensions/ingress/storage/storage_test.go +++ b/pkg/registry/extensions/ingress/storage/storage_test.go @@ -25,6 +25,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" @@ -123,7 +124,7 @@ func TestCreate(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) ingress := validIngress() noDefaultBackendAndRules := validIngress() noDefaultBackendAndRules.Spec.Backend = &extensions.IngressBackend{} @@ -143,7 +144,7 @@ func TestUpdate(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestUpdate( // valid validIngress(), @@ -179,7 +180,7 @@ func TestDelete(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestDelete(validIngress()) } @@ -187,7 +188,7 @@ func TestGet(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestGet(validIngress()) } @@ -195,7 +196,7 @@ func TestList(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestList(validIngress()) } @@ -203,7 +204,7 @@ func TestWatch(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestWatch( validIngress(), // matching labels diff --git a/pkg/registry/extensions/podsecuritypolicy/storage/BUILD b/pkg/registry/extensions/podsecuritypolicy/storage/BUILD index b37eef3a04e..27689d6c342 100644 --- a/pkg/registry/extensions/podsecuritypolicy/storage/BUILD +++ b/pkg/registry/extensions/podsecuritypolicy/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/registry/registrytest:go_default_library", "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", @@ -20,6 +21,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], ) diff --git a/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go b/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go index c01d396f8ee..7defb2195af 100644 --- a/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go +++ b/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go @@ -28,6 +28,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/registry/registrytest" ) @@ -69,7 +70,7 @@ func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() psp := validNewPodSecurityPolicy() psp.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo-"} test.TestCreate( @@ -86,7 +87,7 @@ func TestUpdate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestUpdate( // valid validNewPodSecurityPolicy(), @@ -103,7 +104,7 @@ func TestDelete(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope().ReturnDeletedObject() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope().ReturnDeletedObject() test.TestDelete(validNewPodSecurityPolicy()) } @@ -111,7 +112,7 @@ func TestGet(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestGet(validNewPodSecurityPolicy()) } @@ -119,7 +120,7 @@ func TestList(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestList(validNewPodSecurityPolicy()) } @@ -127,7 +128,7 @@ func TestWatch(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestWatch( validNewPodSecurityPolicy(), // matching labels diff --git a/pkg/registry/extensions/replicaset/storage/BUILD b/pkg/registry/extensions/replicaset/storage/BUILD index cb477227792..e85a18b4a88 100644 --- a/pkg/registry/extensions/replicaset/storage/BUILD +++ b/pkg/registry/extensions/replicaset/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/extensions/replicaset/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/apis/extensions:go_default_library", @@ -25,6 +26,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], diff --git a/pkg/registry/extensions/replicaset/storage/storage_test.go b/pkg/registry/extensions/replicaset/storage/storage_test.go index 4d979fa5f53..8f7980a2127 100644 --- a/pkg/registry/extensions/replicaset/storage/storage_test.go +++ b/pkg/registry/extensions/replicaset/storage/storage_test.go @@ -28,6 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/diff" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" "k8s.io/apiserver/pkg/registry/rest" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" @@ -96,7 +97,7 @@ func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.ReplicaSet.Store.DestroyFunc() - test := registrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme) rs := validNewReplicaSet() rs.ObjectMeta = metav1.ObjectMeta{} test.TestCreate( @@ -117,7 +118,7 @@ func TestUpdate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.ReplicaSet.Store.DestroyFunc() - test := registrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme) test.TestUpdate( // valid validNewReplicaSet(), @@ -145,7 +146,7 @@ func TestDelete(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.ReplicaSet.Store.DestroyFunc() - test := registrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme) test.TestDelete(validNewReplicaSet()) } @@ -204,7 +205,7 @@ func TestGet(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.ReplicaSet.Store.DestroyFunc() - test := registrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme) test.TestGet(validNewReplicaSet()) } @@ -212,7 +213,7 @@ func TestList(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.ReplicaSet.Store.DestroyFunc() - test := registrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme) test.TestList(validNewReplicaSet()) } @@ -220,7 +221,7 @@ func TestWatch(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.ReplicaSet.Store.DestroyFunc() - test := registrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme) test.TestWatch( validNewReplicaSet(), // matching labels diff --git a/pkg/registry/networking/networkpolicy/storage/BUILD b/pkg/registry/networking/networkpolicy/storage/BUILD index bcb2cdeadad..49d408e17e8 100644 --- a/pkg/registry/networking/networkpolicy/storage/BUILD +++ b/pkg/registry/networking/networkpolicy/storage/BUILD @@ -39,6 +39,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/networking/networkpolicy/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/apis/networking:go_default_library", "//pkg/registry/registrytest:go_default_library", @@ -48,6 +49,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], ) diff --git a/pkg/registry/networking/networkpolicy/storage/storage_test.go b/pkg/registry/networking/networkpolicy/storage/storage_test.go index f8f9b337278..d1f1a7e29c0 100644 --- a/pkg/registry/networking/networkpolicy/storage/storage_test.go +++ b/pkg/registry/networking/networkpolicy/storage/storage_test.go @@ -25,6 +25,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" @@ -72,7 +73,7 @@ func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) np := validNetworkPolicy() np.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo-"} test.TestCreate( @@ -90,7 +91,7 @@ func TestUpdate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestUpdate( // valid validNetworkPolicy(), @@ -133,7 +134,7 @@ func TestDelete(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestDelete(validNetworkPolicy()) } @@ -141,7 +142,7 @@ func TestGet(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestGet(validNetworkPolicy()) } @@ -149,7 +150,7 @@ func TestList(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestList(validNetworkPolicy()) } @@ -157,7 +158,7 @@ func TestWatch(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestWatch( validNetworkPolicy(), // matching labels diff --git a/pkg/registry/policy/poddisruptionbudget/storage/BUILD b/pkg/registry/policy/poddisruptionbudget/storage/BUILD index c78c833807d..5f34cc95147 100644 --- a/pkg/registry/policy/poddisruptionbudget/storage/BUILD +++ b/pkg/registry/policy/poddisruptionbudget/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/registry/registrytest:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -20,6 +21,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], diff --git a/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go b/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go index f55b4b6495d..f06c8fcd297 100644 --- a/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go +++ b/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go @@ -25,6 +25,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" "k8s.io/apiserver/pkg/registry/rest" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" @@ -70,7 +71,7 @@ func TestCreate(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) pdb := validNewPodDisruptionBudget() pdb.ObjectMeta = metav1.ObjectMeta{} test.TestCreate( @@ -131,7 +132,7 @@ func TestGet(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestGet(validNewPodDisruptionBudget()) } @@ -139,7 +140,7 @@ func TestList(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestList(validNewPodDisruptionBudget()) } @@ -147,7 +148,7 @@ func TestDelete(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestDelete(validNewPodDisruptionBudget()) } @@ -155,7 +156,7 @@ func TestWatch(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestWatch( validNewPodDisruptionBudget(), // matching labels diff --git a/pkg/registry/registrytest/BUILD b/pkg/registry/registrytest/BUILD index 5a01ba270f5..e2601ad3998 100644 --- a/pkg/registry/registrytest/BUILD +++ b/pkg/registry/registrytest/BUILD @@ -19,26 +19,18 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/registry/registrytest", deps = [ - "//pkg/api/legacyscheme:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/util/slice:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/fields:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic/registry:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library", - "//vendor/k8s.io/apiserver/pkg/registry/rest/resttest:go_default_library", - "//vendor/k8s.io/apiserver/pkg/storage/etcd:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/storagebackend:go_default_library", - "//vendor/k8s.io/apiserver/pkg/storage/testing:go_default_library", ], ) diff --git a/pkg/registry/registrytest/etcd.go b/pkg/registry/registrytest/etcd.go index f82e1d0d70f..061959d9d2a 100644 --- a/pkg/registry/registrytest/etcd.go +++ b/pkg/registry/registrytest/etcd.go @@ -17,22 +17,10 @@ limitations under the License. package registrytest import ( - "fmt" "testing" - "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/api/meta" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/fields" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/apimachinery/pkg/runtime" - genericapirequest "k8s.io/apiserver/pkg/endpoints/request" - genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" - "k8s.io/apiserver/pkg/registry/rest/resttest" - etcdstorage "k8s.io/apiserver/pkg/storage/etcd" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/apiserver/pkg/storage/storagebackend" - storagetesting "k8s.io/apiserver/pkg/storage/testing" "k8s.io/kubernetes/pkg/api/testapi" ) @@ -41,171 +29,3 @@ func NewEtcdStorage(t *testing.T, group string) (*storagebackend.Config, *etcdte config.Codec = testapi.Groups[group].StorageCodec() return config, server } - -type Tester struct { - tester *resttest.Tester - storage *genericregistry.Store -} -type UpdateFunc func(runtime.Object) runtime.Object - -func New(t *testing.T, storage *genericregistry.Store, scheme *runtime.Scheme) *Tester { - return &Tester{ - tester: resttest.New(t, storage, scheme), - storage: storage, - } -} - -func (t *Tester) TestNamespace() string { - return t.tester.TestNamespace() -} - -func (t *Tester) ClusterScope() *Tester { - t.tester = t.tester.ClusterScope() - return t -} - -func (t *Tester) Namer(namer func(int) string) *Tester { - t.tester = t.tester.Namer(namer) - return t -} - -func (t *Tester) AllowCreateOnUpdate() *Tester { - t.tester = t.tester.AllowCreateOnUpdate() - return t -} - -func (t *Tester) GeneratesName() *Tester { - t.tester = t.tester.GeneratesName() - return t -} - -func (t *Tester) ReturnDeletedObject() *Tester { - t.tester = t.tester.ReturnDeletedObject() - return t -} - -func (t *Tester) TestCreate(valid runtime.Object, invalid ...runtime.Object) { - t.tester.TestCreate( - valid, - t.createObject, - t.getObject, - invalid..., - ) -} - -func (t *Tester) TestUpdate(valid runtime.Object, validUpdateFunc UpdateFunc, invalidUpdateFunc ...UpdateFunc) { - var invalidFuncs []resttest.UpdateFunc - for _, f := range invalidUpdateFunc { - invalidFuncs = append(invalidFuncs, resttest.UpdateFunc(f)) - } - t.tester.TestUpdate( - valid, - t.createObject, - t.getObject, - resttest.UpdateFunc(validUpdateFunc), - invalidFuncs..., - ) -} - -func (t *Tester) TestDelete(valid runtime.Object) { - t.tester.TestDelete( - valid, - t.createObject, - t.getObject, - errors.IsNotFound, - ) -} - -func (t *Tester) TestDeleteGraceful(valid runtime.Object, expectedGrace int64) { - t.tester.TestDeleteGraceful( - valid, - t.createObject, - t.getObject, - expectedGrace, - ) -} - -func (t *Tester) TestGet(valid runtime.Object) { - t.tester.TestGet(valid) -} - -func (t *Tester) TestList(valid runtime.Object) { - t.tester.TestList( - valid, - t.setObjectsForList, - ) -} - -func (t *Tester) TestWatch(valid runtime.Object, labelsPass, labelsFail []labels.Set, fieldsPass, fieldsFail []fields.Set) { - t.tester.TestWatch( - valid, - t.emitObject, - labelsPass, - labelsFail, - fieldsPass, - fieldsFail, - // TODO: This should be filtered, the registry should not be aware of this level of detail - []string{etcdstorage.EtcdCreate, etcdstorage.EtcdDelete}, - ) -} - -// Helper functions - -func (t *Tester) getObject(ctx genericapirequest.Context, obj runtime.Object) (runtime.Object, error) { - accessor, err := meta.Accessor(obj) - if err != nil { - return nil, err - } - - result, err := t.storage.Get(ctx, accessor.GetName(), &metav1.GetOptions{}) - if err != nil { - return nil, err - } - return result, nil -} - -func (t *Tester) createObject(ctx genericapirequest.Context, obj runtime.Object) error { - accessor, err := meta.Accessor(obj) - if err != nil { - return err - } - key, err := t.storage.KeyFunc(ctx, accessor.GetName()) - if err != nil { - return err - } - return t.storage.Storage.Create(ctx, key, obj, nil, 0) -} - -func (t *Tester) setObjectsForList(objects []runtime.Object) []runtime.Object { - key := t.storage.KeyRootFunc(t.tester.TestContext()) - if _, err := t.storage.DeleteCollection(t.tester.TestContext(), nil, nil); err != nil { - t.tester.Errorf("unable to clear collection: %v", err) - return nil - } - if err := storagetesting.CreateObjList(key, t.storage.Storage, objects); err != nil { - t.tester.Errorf("unexpected error: %v", err) - return nil - } - return objects -} - -func (t *Tester) emitObject(obj runtime.Object, action string) error { - ctx := t.tester.TestContext() - var err error - - switch action { - case etcdstorage.EtcdCreate: - err = t.createObject(ctx, obj) - case etcdstorage.EtcdDelete: - var accessor metav1.Object - accessor, err = meta.Accessor(obj) - if err != nil { - return err - } - _, _, err = t.storage.Delete(ctx, accessor.GetName(), nil) - default: - err = fmt.Errorf("unexpected action: %v", action) - } - - return err -} diff --git a/pkg/registry/scheduling/priorityclass/storage/BUILD b/pkg/registry/scheduling/priorityclass/storage/BUILD index ce83faea11f..71d89616534 100644 --- a/pkg/registry/scheduling/priorityclass/storage/BUILD +++ b/pkg/registry/scheduling/priorityclass/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/scheduling/priorityclass/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/scheduling:go_default_library", "//pkg/registry/registrytest:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -19,6 +20,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], ) diff --git a/pkg/registry/scheduling/priorityclass/storage/storage_test.go b/pkg/registry/scheduling/priorityclass/storage/storage_test.go index bc32e111d43..3f9ea866c69 100644 --- a/pkg/registry/scheduling/priorityclass/storage/storage_test.go +++ b/pkg/registry/scheduling/priorityclass/storage/storage_test.go @@ -24,6 +24,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/apis/scheduling" @@ -56,7 +57,7 @@ func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestCreate( validNewPriorityClass(), // invalid cases @@ -75,7 +76,7 @@ func TestUpdate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestUpdate( // valid validNewPriorityClass(), @@ -101,7 +102,7 @@ func TestDelete(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestDelete(validNewPriorityClass()) } @@ -109,7 +110,7 @@ func TestGet(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestGet(validNewPriorityClass()) } @@ -117,7 +118,7 @@ func TestList(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestList(validNewPriorityClass()) } @@ -125,7 +126,7 @@ func TestWatch(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestWatch( validNewPriorityClass(), // matching labels diff --git a/pkg/registry/settings/podpreset/storage/BUILD b/pkg/registry/settings/podpreset/storage/BUILD index 692dfc7ba31..4d76facb8fa 100644 --- a/pkg/registry/settings/podpreset/storage/BUILD +++ b/pkg/registry/settings/podpreset/storage/BUILD @@ -38,6 +38,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/settings/podpreset/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/apis/settings:go_default_library", "//pkg/registry/registrytest:go_default_library", @@ -46,6 +47,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], ) diff --git a/pkg/registry/settings/podpreset/storage/storage_test.go b/pkg/registry/settings/podpreset/storage/storage_test.go index a5d8d64dcb2..0c1ba980bff 100644 --- a/pkg/registry/settings/podpreset/storage/storage_test.go +++ b/pkg/registry/settings/podpreset/storage/storage_test.go @@ -24,6 +24,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" @@ -103,7 +104,7 @@ func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) invalidPodPreset := validNewPodPreset(test.TestNamespace()) invalidPodPreset.Spec.VolumeMounts[0].Name = "/cache/VolumeMounts" test.TestCreate( @@ -117,7 +118,7 @@ func TestUpdate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestUpdate( // valid validNewPodPreset(test.TestNamespace()), @@ -134,7 +135,7 @@ func TestDelete(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestDelete(validNewPodPreset(test.TestNamespace())) } @@ -142,7 +143,7 @@ func TestGet(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestGet(validNewPodPreset(test.TestNamespace())) } @@ -150,7 +151,7 @@ func TestList(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestList(validNewPodPreset(test.TestNamespace())) } @@ -158,7 +159,7 @@ func TestWatch(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme) + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test.TestWatch( validNewPodPreset(test.TestNamespace()), // matching labels diff --git a/pkg/registry/storage/storageclass/storage/BUILD b/pkg/registry/storage/storageclass/storage/BUILD index 8fe66298367..ff7c2ff6700 100644 --- a/pkg/registry/storage/storageclass/storage/BUILD +++ b/pkg/registry/storage/storageclass/storage/BUILD @@ -12,6 +12,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/storage/storageclass/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/apis/storage:go_default_library", "//pkg/registry/registrytest:go_default_library", @@ -20,6 +21,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], ) diff --git a/pkg/registry/storage/storageclass/storage/storage_test.go b/pkg/registry/storage/storageclass/storage/storage_test.go index bc1d2c973d4..9b708c475eb 100644 --- a/pkg/registry/storage/storageclass/storage/storage_test.go +++ b/pkg/registry/storage/storageclass/storage/storage_test.go @@ -24,6 +24,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" @@ -65,7 +66,7 @@ func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() storageClass := validNewStorageClass("foo") storageClass.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"} deleteReclaimPolicy := api.PersistentVolumeReclaimDelete @@ -84,7 +85,7 @@ func TestUpdate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestUpdate( // valid validNewStorageClass("foo"), @@ -108,7 +109,7 @@ func TestDelete(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope().ReturnDeletedObject() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope().ReturnDeletedObject() test.TestDelete(validNewStorageClass("foo")) } @@ -116,7 +117,7 @@ func TestGet(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestGet(validNewStorageClass("foo")) } @@ -124,7 +125,7 @@ func TestList(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestList(validNewStorageClass("foo")) } @@ -132,7 +133,7 @@ func TestWatch(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestWatch( validNewStorageClass("foo"), // matching labels diff --git a/pkg/registry/storage/volumeattachment/storage/BUILD b/pkg/registry/storage/volumeattachment/storage/BUILD index c05912d09ea..dcae6d3a750 100644 --- a/pkg/registry/storage/volumeattachment/storage/BUILD +++ b/pkg/registry/storage/volumeattachment/storage/BUILD @@ -20,6 +20,7 @@ go_test( importpath = "k8s.io/kubernetes/pkg/registry/storage/volumeattachment/storage", library = ":go_default_library", deps = [ + "//pkg/api/legacyscheme:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/apis/storage:go_default_library", "//pkg/registry/registrytest:go_default_library", @@ -29,6 +30,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", ], ) diff --git a/pkg/registry/storage/volumeattachment/storage/storage_test.go b/pkg/registry/storage/volumeattachment/storage/storage_test.go index e6de8b54b3e..871bb63f484 100644 --- a/pkg/registry/storage/volumeattachment/storage/storage_test.go +++ b/pkg/registry/storage/volumeattachment/storage/storage_test.go @@ -25,7 +25,9 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" + genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" + "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/api/testapi" storageapi "k8s.io/kubernetes/pkg/apis/storage" "k8s.io/kubernetes/pkg/registry/registrytest" @@ -72,7 +74,7 @@ func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() volumeAttachment := validNewVolumeAttachment("foo") volumeAttachment.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"} pvName := "foo" @@ -102,7 +104,7 @@ func TestUpdate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestUpdate( // valid validNewVolumeAttachment("foo"), @@ -130,7 +132,7 @@ func TestDelete(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store).ClusterScope().ReturnDeletedObject() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope().ReturnDeletedObject() test.TestDelete(validNewVolumeAttachment("foo")) } @@ -143,7 +145,7 @@ func TestGet(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestGet(validNewVolumeAttachment("foo")) } @@ -156,7 +158,7 @@ func TestList(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestList(validNewVolumeAttachment("foo")) } @@ -169,7 +171,7 @@ func TestWatch(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) defer storage.Store.DestroyFunc() - test := registrytest.New(t, storage.Store).ClusterScope() + test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test.TestWatch( validNewVolumeAttachment("foo"), // matching labels diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/BUILD b/staging/src/k8s.io/apiserver/pkg/registry/generic/BUILD index b46fb9eebb4..43471c04376 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/generic/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/BUILD @@ -39,6 +39,7 @@ filegroup( ":package-srcs", "//staging/src/k8s.io/apiserver/pkg/registry/generic/registry:all-srcs", "//staging/src/k8s.io/apiserver/pkg/registry/generic/rest:all-srcs", + "//staging/src/k8s.io/apiserver/pkg/registry/generic/testing:all-srcs", ], tags = ["automanaged"], ) diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/testing/BUILD b/staging/src/k8s.io/apiserver/pkg/registry/generic/testing/BUILD new file mode 100644 index 00000000000..088c78d678c --- /dev/null +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/testing/BUILD @@ -0,0 +1,35 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = ["tester.go"], + importpath = "k8s.io/apiserver/pkg/registry/generic/testing", + visibility = ["//visibility:public"], + deps = [ + "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/fields:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", + "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/generic/registry:go_default_library", + "//vendor/k8s.io/apiserver/pkg/registry/rest/resttest:go_default_library", + "//vendor/k8s.io/apiserver/pkg/storage/etcd:go_default_library", + "//vendor/k8s.io/apiserver/pkg/storage/testing:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/testing/tester.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/testing/tester.go new file mode 100644 index 00000000000..4125e40b3c1 --- /dev/null +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/testing/tester.go @@ -0,0 +1,202 @@ +/* +Copyright 2015 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package tester + +import ( + "fmt" + "testing" + + "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/api/meta" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/fields" + "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/runtime" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest/resttest" + etcdstorage "k8s.io/apiserver/pkg/storage/etcd" + storagetesting "k8s.io/apiserver/pkg/storage/testing" +) + +type Tester struct { + tester *resttest.Tester + storage *genericregistry.Store +} +type UpdateFunc func(runtime.Object) runtime.Object + +func New(t *testing.T, storage *genericregistry.Store, scheme *runtime.Scheme) *Tester { + return &Tester{ + tester: resttest.New(t, storage, scheme), + storage: storage, + } +} + +func (t *Tester) TestNamespace() string { + return t.tester.TestNamespace() +} + +func (t *Tester) ClusterScope() *Tester { + t.tester = t.tester.ClusterScope() + return t +} + +func (t *Tester) Namer(namer func(int) string) *Tester { + t.tester = t.tester.Namer(namer) + return t +} + +func (t *Tester) AllowCreateOnUpdate() *Tester { + t.tester = t.tester.AllowCreateOnUpdate() + return t +} + +func (t *Tester) GeneratesName() *Tester { + t.tester = t.tester.GeneratesName() + return t +} + +func (t *Tester) ReturnDeletedObject() *Tester { + t.tester = t.tester.ReturnDeletedObject() + return t +} + +func (t *Tester) TestCreate(valid runtime.Object, invalid ...runtime.Object) { + t.tester.TestCreate( + valid, + t.createObject, + t.getObject, + invalid..., + ) +} + +func (t *Tester) TestUpdate(valid runtime.Object, validUpdateFunc UpdateFunc, invalidUpdateFunc ...UpdateFunc) { + var invalidFuncs []resttest.UpdateFunc + for _, f := range invalidUpdateFunc { + invalidFuncs = append(invalidFuncs, resttest.UpdateFunc(f)) + } + t.tester.TestUpdate( + valid, + t.createObject, + t.getObject, + resttest.UpdateFunc(validUpdateFunc), + invalidFuncs..., + ) +} + +func (t *Tester) TestDelete(valid runtime.Object) { + t.tester.TestDelete( + valid, + t.createObject, + t.getObject, + errors.IsNotFound, + ) +} + +func (t *Tester) TestDeleteGraceful(valid runtime.Object, expectedGrace int64) { + t.tester.TestDeleteGraceful( + valid, + t.createObject, + t.getObject, + expectedGrace, + ) +} + +func (t *Tester) TestGet(valid runtime.Object) { + t.tester.TestGet(valid) +} + +func (t *Tester) TestList(valid runtime.Object) { + t.tester.TestList( + valid, + t.setObjectsForList, + ) +} + +func (t *Tester) TestWatch(valid runtime.Object, labelsPass, labelsFail []labels.Set, fieldsPass, fieldsFail []fields.Set) { + t.tester.TestWatch( + valid, + t.emitObject, + labelsPass, + labelsFail, + fieldsPass, + fieldsFail, + // TODO: This should be filtered, the registry should not be aware of this level of detail + []string{etcdstorage.EtcdCreate, etcdstorage.EtcdDelete}, + ) +} + +// Helper functions + +func (t *Tester) getObject(ctx genericapirequest.Context, obj runtime.Object) (runtime.Object, error) { + accessor, err := meta.Accessor(obj) + if err != nil { + return nil, err + } + + result, err := t.storage.Get(ctx, accessor.GetName(), &metav1.GetOptions{}) + if err != nil { + return nil, err + } + return result, nil +} + +func (t *Tester) createObject(ctx genericapirequest.Context, obj runtime.Object) error { + accessor, err := meta.Accessor(obj) + if err != nil { + return err + } + key, err := t.storage.KeyFunc(ctx, accessor.GetName()) + if err != nil { + return err + } + return t.storage.Storage.Create(ctx, key, obj, nil, 0) +} + +func (t *Tester) setObjectsForList(objects []runtime.Object) []runtime.Object { + key := t.storage.KeyRootFunc(t.tester.TestContext()) + if _, err := t.storage.DeleteCollection(t.tester.TestContext(), nil, nil); err != nil { + t.tester.Errorf("unable to clear collection: %v", err) + return nil + } + if err := storagetesting.CreateObjList(key, t.storage.Storage, objects); err != nil { + t.tester.Errorf("unexpected error: %v", err) + return nil + } + return objects +} + +func (t *Tester) emitObject(obj runtime.Object, action string) error { + ctx := t.tester.TestContext() + var err error + + switch action { + case etcdstorage.EtcdCreate: + err = t.createObject(ctx, obj) + case etcdstorage.EtcdDelete: + var accessor metav1.Object + accessor, err = meta.Accessor(obj) + if err != nil { + return err + } + _, _, err = t.storage.Delete(ctx, accessor.GetName(), nil) + default: + err = fmt.Errorf("unexpected action: %v", action) + } + + return err +}