Skip to content

K
k3s
Unverified Commit c7e7b928 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #55622 from sttts/sttts-cut-off-deps-registrytest

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. apiserver: move generic registry test framework into k8s.io/apiserver The generic registry `Tester` does not depend on Kube. It is helpful also outside when implementing a non-trivial registry. This is pre-requisite for CRD subreasources https://github.com/kubernetes/kubernetes/pull/55168.
parents ee2cf0bb 0b100cb6
Hide whitespace changes
Inline Side-by-side
Showing with 542 additions and 393 deletions
hack/.golint_failures
View file @ c7e7b928
cluster/images/etcd-version-monitor cluster/images/etcd-version-monitor
cmd/gke-certificates-controller/app cmd/gke-certificates-controller/app
cmd/hyperkube cmd/hyperkube
...@@ -579,6 +578,7 @@ staging/src/k8s.io/apiserver/pkg/features ...@@ -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
staging/src/k8s.io/apiserver/pkg/registry/generic/registry 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/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
staging/src/k8s.io/apiserver/pkg/registry/rest/resttest staging/src/k8s.io/apiserver/pkg/registry/rest/resttest
staging/src/k8s.io/apiserver/pkg/server staging/src/k8s.io/apiserver/pkg/server
......
pkg/registry/apps/controllerrevision/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/apps/controllerrevision/storage", importpath = "k8s.io/kubernetes/pkg/registry/apps/controllerrevision/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/apps:go_default_library", "//pkg/apis/apps:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
...@@ -20,6 +21,7 @@ go_test( ...@@ -20,6 +21,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/labels: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/runtime:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
) )
......
pkg/registry/apps/controllerrevision/storage/storage_test.go
View file @ c7e7b928
...@@ -24,7 +24,9 @@ import ( ...@@ -24,7 +24,9 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/apps"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
...@@ -34,7 +36,7 @@ func TestCreate(t *testing.T) { ...@@ -34,7 +36,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
var ( var (
valid = stripObjectMeta(newControllerRevision("validname", metav1.NamespaceDefault, newObject(), 0)) valid = stripObjectMeta(newControllerRevision("validname", metav1.NamespaceDefault, newObject(), 0))
badRevision = stripObjectMeta(newControllerRevision("validname", "validns", newObject(), -1)) badRevision = stripObjectMeta(newControllerRevision("validname", "validns", newObject(), -1))
...@@ -58,7 +60,7 @@ func TestUpdate(t *testing.T) { ...@@ -58,7 +60,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
addLabel := func(obj runtime.Object) runtime.Object { addLabel := func(obj runtime.Object) runtime.Object {
rev := obj.(*apps.ControllerRevision) rev := obj.(*apps.ControllerRevision)
...@@ -93,7 +95,7 @@ func TestGet(t *testing.T) { ...@@ -93,7 +95,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestGet(newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0)) test.TestGet(newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0))
} }
...@@ -101,7 +103,7 @@ func TestList(t *testing.T) { ...@@ -101,7 +103,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestList(newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0)) test.TestList(newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0))
} }
...@@ -109,7 +111,7 @@ func TestDelete(t *testing.T) { ...@@ -109,7 +111,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestDelete(newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0)) test.TestDelete(newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0))
} }
...@@ -117,7 +119,7 @@ func TestWatch(t *testing.T) { ...@@ -117,7 +119,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0), newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0),
[]labels.Set{ []labels.Set{
......
pkg/registry/apps/statefulset/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/apps/statefulset/storage", importpath = "k8s.io/kubernetes/pkg/registry/apps/statefulset/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/apps:go_default_library", "//pkg/apis/apps:go_default_library",
"//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
...@@ -24,6 +25,7 @@ go_test( ...@@ -24,6 +25,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//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/endpoints/request:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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/registry/rest:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
......
pkg/registry/apps/statefulset/storage/storage_test.go
View file @ c7e7b928
...@@ -27,8 +27,10 @@ import ( ...@@ -27,8 +27,10 @@ import (
"k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/diff"
genericapirequest "k8s.io/apiserver/pkg/endpoints/request" genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/apps"
"k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
...@@ -93,7 +95,7 @@ func TestCreate(t *testing.T) { ...@@ -93,7 +95,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.StatefulSet.Store.DestroyFunc() defer storage.StatefulSet.Store.DestroyFunc()
test := registrytest.New(t, storage.StatefulSet.Store) test := genericregistrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme)
ps := validNewStatefulSet() ps := validNewStatefulSet()
ps.ObjectMeta = metav1.ObjectMeta{} ps.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -146,7 +148,7 @@ func TestGet(t *testing.T) { ...@@ -146,7 +148,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.StatefulSet.Store.DestroyFunc() defer storage.StatefulSet.Store.DestroyFunc()
test := registrytest.New(t, storage.StatefulSet.Store) test := genericregistrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme)
test.TestGet(validNewStatefulSet()) test.TestGet(validNewStatefulSet())
} }
...@@ -154,7 +156,7 @@ func TestList(t *testing.T) { ...@@ -154,7 +156,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.StatefulSet.Store.DestroyFunc() defer storage.StatefulSet.Store.DestroyFunc()
test := registrytest.New(t, storage.StatefulSet.Store) test := genericregistrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme)
test.TestList(validNewStatefulSet()) test.TestList(validNewStatefulSet())
} }
...@@ -162,7 +164,7 @@ func TestDelete(t *testing.T) { ...@@ -162,7 +164,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.StatefulSet.Store.DestroyFunc() defer storage.StatefulSet.Store.DestroyFunc()
test := registrytest.New(t, storage.StatefulSet.Store) test := genericregistrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme)
test.TestDelete(validNewStatefulSet()) test.TestDelete(validNewStatefulSet())
} }
...@@ -170,7 +172,7 @@ func TestWatch(t *testing.T) { ...@@ -170,7 +172,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.StatefulSet.Store.DestroyFunc() defer storage.StatefulSet.Store.DestroyFunc()
test := registrytest.New(t, storage.StatefulSet.Store) test := genericregistrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validNewStatefulSet(), validNewStatefulSet(),
// matching labels // matching labels
......
pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/storage", importpath = "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
...@@ -21,6 +22,7 @@ go_test( ...@@ -21,6 +22,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/labels: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/runtime:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
) )
......
pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go
View file @ c7e7b928
...@@ -20,6 +20,7 @@ import ( ...@@ -20,6 +20,7 @@ import (
"testing" "testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
// Ensure that autoscaling/v1 package is initialized. // Ensure that autoscaling/v1 package is initialized.
...@@ -28,6 +29,7 @@ import ( ...@@ -28,6 +29,7 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -74,7 +76,7 @@ func TestCreate(t *testing.T) { ...@@ -74,7 +76,7 @@ func TestCreate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
autoscaler := validNewHorizontalPodAutoscaler("foo") autoscaler := validNewHorizontalPodAutoscaler("foo")
autoscaler.ObjectMeta = metav1.ObjectMeta{} autoscaler.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -89,7 +91,7 @@ func TestUpdate(t *testing.T) { ...@@ -89,7 +91,7 @@ func TestUpdate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewHorizontalPodAutoscaler("foo"), validNewHorizontalPodAutoscaler("foo"),
...@@ -106,7 +108,7 @@ func TestDelete(t *testing.T) { ...@@ -106,7 +108,7 @@ func TestDelete(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestDelete(validNewHorizontalPodAutoscaler("foo")) test.TestDelete(validNewHorizontalPodAutoscaler("foo"))
} }
...@@ -114,7 +116,7 @@ func TestGet(t *testing.T) { ...@@ -114,7 +116,7 @@ func TestGet(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestGet(validNewHorizontalPodAutoscaler("foo")) test.TestGet(validNewHorizontalPodAutoscaler("foo"))
} }
...@@ -122,7 +124,7 @@ func TestList(t *testing.T) { ...@@ -122,7 +124,7 @@ func TestList(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestList(validNewHorizontalPodAutoscaler("foo")) test.TestList(validNewHorizontalPodAutoscaler("foo"))
} }
...@@ -130,7 +132,7 @@ func TestWatch(t *testing.T) { ...@@ -130,7 +132,7 @@ func TestWatch(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validNewHorizontalPodAutoscaler("foo"), validNewHorizontalPodAutoscaler("foo"),
// matching labels // matching labels
......
pkg/registry/batch/cronjob/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/batch/cronjob/storage", importpath = "k8s.io/kubernetes/pkg/registry/batch/cronjob/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/api/testapi:go_default_library", "//pkg/api/testapi:go_default_library",
"//pkg/apis/batch:go_default_library", "//pkg/apis/batch:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
...@@ -22,6 +23,7 @@ go_test( ...@@ -22,6 +23,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/labels: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/runtime:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
) )
......
pkg/registry/batch/cronjob/storage/storage_test.go
View file @ c7e7b928
...@@ -25,7 +25,9 @@ import ( ...@@ -25,7 +25,9 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/batch"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
...@@ -73,7 +75,7 @@ func TestCreate(t *testing.T) { ...@@ -73,7 +75,7 @@ func TestCreate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
validCronJob := validNewCronJob() validCronJob := validNewCronJob()
validCronJob.ObjectMeta = metav1.ObjectMeta{} validCronJob.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -95,7 +97,7 @@ func TestUpdate(t *testing.T) { ...@@ -95,7 +97,7 @@ func TestUpdate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
schedule := "1 1 1 1 ?" schedule := "1 1 1 1 ?"
test.TestUpdate( test.TestUpdate(
// valid // valid
...@@ -124,7 +126,7 @@ func TestDelete(t *testing.T) { ...@@ -124,7 +126,7 @@ func TestDelete(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestDelete(validNewCronJob()) test.TestDelete(validNewCronJob())
} }
...@@ -137,7 +139,7 @@ func TestGet(t *testing.T) { ...@@ -137,7 +139,7 @@ func TestGet(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestGet(validNewCronJob()) test.TestGet(validNewCronJob())
} }
...@@ -150,7 +152,7 @@ func TestList(t *testing.T) { ...@@ -150,7 +152,7 @@ func TestList(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestList(validNewCronJob()) test.TestList(validNewCronJob())
} }
...@@ -163,7 +165,7 @@ func TestWatch(t *testing.T) { ...@@ -163,7 +165,7 @@ func TestWatch(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validNewCronJob(), validNewCronJob(),
// matching labels // matching labels
......
pkg/registry/batch/job/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/batch/job/storage", importpath = "k8s.io/kubernetes/pkg/registry/batch/job/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/batch:go_default_library", "//pkg/apis/batch:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
...@@ -20,6 +21,7 @@ go_test( ...@@ -20,6 +21,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/labels: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/runtime:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
) )
......
pkg/registry/batch/job/storage/storage_test.go
View file @ c7e7b928
...@@ -24,7 +24,9 @@ import ( ...@@ -24,7 +24,9 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/batch"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
...@@ -82,7 +84,7 @@ func TestCreate(t *testing.T) { ...@@ -82,7 +84,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Job.Store.DestroyFunc() defer storage.Job.Store.DestroyFunc()
test := registrytest.New(t, storage.Job.Store) test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme)
validJob := validNewJob() validJob := validNewJob()
validJob.ObjectMeta = metav1.ObjectMeta{} validJob.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -103,7 +105,7 @@ func TestUpdate(t *testing.T) { ...@@ -103,7 +105,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Job.Store.DestroyFunc() defer storage.Job.Store.DestroyFunc()
test := registrytest.New(t, storage.Job.Store) test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme)
two := int32(2) two := int32(2)
test.TestUpdate( test.TestUpdate(
// valid // valid
...@@ -132,7 +134,7 @@ func TestDelete(t *testing.T) { ...@@ -132,7 +134,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Job.Store.DestroyFunc() defer storage.Job.Store.DestroyFunc()
test := registrytest.New(t, storage.Job.Store) test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme)
test.TestDelete(validNewJob()) test.TestDelete(validNewJob())
} }
...@@ -140,7 +142,7 @@ func TestGet(t *testing.T) { ...@@ -140,7 +142,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Job.Store.DestroyFunc() defer storage.Job.Store.DestroyFunc()
test := registrytest.New(t, storage.Job.Store) test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme)
test.TestGet(validNewJob()) test.TestGet(validNewJob())
} }
...@@ -148,7 +150,7 @@ func TestList(t *testing.T) { ...@@ -148,7 +150,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Job.Store.DestroyFunc() defer storage.Job.Store.DestroyFunc()
test := registrytest.New(t, storage.Job.Store) test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme)
test.TestList(validNewJob()) test.TestList(validNewJob())
} }
...@@ -156,7 +158,7 @@ func TestWatch(t *testing.T) { ...@@ -156,7 +158,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Job.Store.DestroyFunc() defer storage.Job.Store.DestroyFunc()
test := registrytest.New(t, storage.Job.Store) test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validNewJob(), validNewJob(),
// matching labels // matching labels
......
pkg/registry/core/configmap/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/configmap/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/configmap/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest: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/apis/meta/v1:go_default_library",
...@@ -19,6 +20,7 @@ go_test( ...@@ -19,6 +20,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/labels: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/runtime:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
) )
......
pkg/registry/core/configmap/storage/storage_test.go
View file @ c7e7b928
...@@ -24,7 +24,9 @@ import ( ...@@ -24,7 +24,9 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -60,7 +62,7 @@ func TestCreate(t *testing.T) { ...@@ -60,7 +62,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
validConfigMap := validNewConfigMap() validConfigMap := validNewConfigMap()
validConfigMap.ObjectMeta = metav1.ObjectMeta{ validConfigMap.ObjectMeta = metav1.ObjectMeta{
...@@ -88,7 +90,7 @@ func TestUpdate(t *testing.T) { ...@@ -88,7 +90,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewConfigMap(), validNewConfigMap(),
...@@ -111,7 +113,7 @@ func TestDelete(t *testing.T) { ...@@ -111,7 +113,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestDelete(validNewConfigMap()) test.TestDelete(validNewConfigMap())
} }
...@@ -119,7 +121,7 @@ func TestGet(t *testing.T) { ...@@ -119,7 +121,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestGet(validNewConfigMap()) test.TestGet(validNewConfigMap())
} }
...@@ -127,7 +129,7 @@ func TestList(t *testing.T) { ...@@ -127,7 +129,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestList(validNewConfigMap()) test.TestList(validNewConfigMap())
} }
...@@ -135,7 +137,7 @@ func TestWatch(t *testing.T) { ...@@ -135,7 +137,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validNewConfigMap(), validNewConfigMap(),
// matching labels // matching labels
......
pkg/registry/core/endpoint/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/endpoint/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/endpoint/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest: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/apis/meta/v1:go_default_library",
...@@ -19,6 +20,7 @@ go_test( ...@@ -19,6 +20,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/labels: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/runtime:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
) )
......
pkg/registry/core/endpoint/storage/storage_test.go
View file @ c7e7b928
...@@ -24,7 +24,9 @@ import ( ...@@ -24,7 +24,9 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -67,7 +69,7 @@ func TestCreate(t *testing.T) { ...@@ -67,7 +69,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
endpoints := validNewEndpoints() endpoints := validNewEndpoints()
endpoints.ObjectMeta = metav1.ObjectMeta{} endpoints.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -84,7 +86,7 @@ func TestUpdate(t *testing.T) { ...@@ -84,7 +86,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).AllowCreateOnUpdate() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate()
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewEndpoints(), validNewEndpoints(),
...@@ -104,7 +106,7 @@ func TestDelete(t *testing.T) { ...@@ -104,7 +106,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestDelete(validNewEndpoints()) test.TestDelete(validNewEndpoints())
} }
...@@ -112,7 +114,7 @@ func TestGet(t *testing.T) { ...@@ -112,7 +114,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestGet(validNewEndpoints()) test.TestGet(validNewEndpoints())
} }
...@@ -120,7 +122,7 @@ func TestList(t *testing.T) { ...@@ -120,7 +122,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestList(validNewEndpoints()) test.TestList(validNewEndpoints())
} }
...@@ -128,7 +130,7 @@ func TestWatch(t *testing.T) { ...@@ -128,7 +130,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validNewEndpoints(), validNewEndpoints(),
// matching labels // matching labels
......
pkg/registry/core/event/storage/BUILD
View file @ c7e7b928
...@@ -12,11 +12,13 @@ go_test( ...@@ -12,11 +12,13 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/event/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/event/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest: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/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime: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: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", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
) )
......
pkg/registry/core/event/storage/storage_test.go
View file @ c7e7b928
...@@ -22,7 +22,9 @@ import ( ...@@ -22,7 +22,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -58,7 +60,7 @@ func TestCreate(t *testing.T) { ...@@ -58,7 +60,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
event := validNewEvent(test.TestNamespace()) event := validNewEvent(test.TestNamespace())
event.ObjectMeta = metav1.ObjectMeta{} event.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -73,7 +75,7 @@ func TestUpdate(t *testing.T) { ...@@ -73,7 +75,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).AllowCreateOnUpdate() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate()
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewEvent(test.TestNamespace()), validNewEvent(test.TestNamespace()),
...@@ -96,7 +98,7 @@ func TestDelete(t *testing.T) { ...@@ -96,7 +98,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestDelete(validNewEvent(test.TestNamespace())) test.TestDelete(validNewEvent(test.TestNamespace()))
} }
......
pkg/registry/core/limitrange/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/limitrange/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/limitrange/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
...@@ -20,6 +21,7 @@ go_test( ...@@ -20,6 +21,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/labels: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/runtime:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
) )
......
pkg/registry/core/limitrange/storage/storage_test.go
View file @ c7e7b928
...@@ -25,7 +25,9 @@ import ( ...@@ -25,7 +25,9 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -69,7 +71,7 @@ func TestCreate(t *testing.T) { ...@@ -69,7 +71,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).GeneratesName() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).GeneratesName()
validLimitRange := validNewLimitRange() validLimitRange := validNewLimitRange()
validLimitRange.ObjectMeta = metav1.ObjectMeta{} validLimitRange.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -86,7 +88,7 @@ func TestUpdate(t *testing.T) { ...@@ -86,7 +88,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).AllowCreateOnUpdate() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate()
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewLimitRange(), validNewLimitRange(),
...@@ -115,7 +117,7 @@ func TestDelete(t *testing.T) { ...@@ -115,7 +117,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestDelete(validNewLimitRange()) test.TestDelete(validNewLimitRange())
} }
...@@ -123,7 +125,7 @@ func TestGet(t *testing.T) { ...@@ -123,7 +125,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestGet(validNewLimitRange()) test.TestGet(validNewLimitRange())
} }
...@@ -131,7 +133,7 @@ func TestList(t *testing.T) { ...@@ -131,7 +133,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestList(validNewLimitRange()) test.TestList(validNewLimitRange())
} }
...@@ -139,7 +141,7 @@ func TestWatch(t *testing.T) { ...@@ -139,7 +141,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validNewLimitRange(), validNewLimitRange(),
// matching labels // matching labels
......
pkg/registry/core/namespace/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/namespace/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/namespace/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest: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/apis/meta/v1:go_default_library",
...@@ -19,6 +20,7 @@ go_test( ...@@ -19,6 +20,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
"//vendor/k8s.io/apiserver/pkg/endpoints/request: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: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/registry/rest:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
......
pkg/registry/core/namespace/storage/storage_test.go
View file @ c7e7b928
...@@ -24,8 +24,10 @@ import ( ...@@ -24,8 +24,10 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
genericapirequest "k8s.io/apiserver/pkg/endpoints/request" genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -49,7 +51,7 @@ func TestCreate(t *testing.T) { ...@@ -49,7 +51,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.store.DestroyFunc() defer storage.store.DestroyFunc()
test := registrytest.New(t, storage.store).ClusterScope() test := genericregistrytest.New(t, storage.store, legacyscheme.Scheme).ClusterScope()
namespace := validNewNamespace() namespace := validNewNamespace()
namespace.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"} namespace.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"}
test.TestCreate( test.TestCreate(
...@@ -93,7 +95,7 @@ func TestDelete(t *testing.T) { ...@@ -93,7 +95,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.store.DestroyFunc() defer storage.store.DestroyFunc()
test := registrytest.New(t, storage.store).ClusterScope().ReturnDeletedObject() test := genericregistrytest.New(t, storage.store, legacyscheme.Scheme).ClusterScope().ReturnDeletedObject()
test.TestDelete(validNewNamespace()) test.TestDelete(validNewNamespace())
} }
...@@ -101,7 +103,7 @@ func TestGet(t *testing.T) { ...@@ -101,7 +103,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.store.DestroyFunc() defer storage.store.DestroyFunc()
test := registrytest.New(t, storage.store).ClusterScope() test := genericregistrytest.New(t, storage.store, legacyscheme.Scheme).ClusterScope()
test.TestGet(validNewNamespace()) test.TestGet(validNewNamespace())
} }
...@@ -109,7 +111,7 @@ func TestList(t *testing.T) { ...@@ -109,7 +111,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.store.DestroyFunc() defer storage.store.DestroyFunc()
test := registrytest.New(t, storage.store).ClusterScope() test := genericregistrytest.New(t, storage.store, legacyscheme.Scheme).ClusterScope()
test.TestList(validNewNamespace()) test.TestList(validNewNamespace())
} }
...@@ -117,7 +119,7 @@ func TestWatch(t *testing.T) { ...@@ -117,7 +119,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.store.DestroyFunc() defer storage.store.DestroyFunc()
test := registrytest.New(t, storage.store).ClusterScope() test := genericregistrytest.New(t, storage.store, legacyscheme.Scheme).ClusterScope()
test.TestWatch( test.TestWatch(
validNewNamespace(), validNewNamespace(),
// matching labels // matching labels
......
pkg/registry/core/node/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/node/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/node/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/kubelet/client:go_default_library", "//pkg/kubelet/client:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
...@@ -21,6 +22,7 @@ go_test( ...@@ -21,6 +22,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/labels: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/runtime:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
) )
......
pkg/registry/core/node/storage/storage_test.go
View file @ c7e7b928
...@@ -25,7 +25,9 @@ import ( ...@@ -25,7 +25,9 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
...@@ -70,7 +72,7 @@ func TestCreate(t *testing.T) { ...@@ -70,7 +72,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
node := validNewNode() node := validNewNode()
node.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"} node.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"}
test.TestCreate( test.TestCreate(
...@@ -87,7 +89,7 @@ func TestUpdate(t *testing.T) { ...@@ -87,7 +89,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewNode(), validNewNode(),
...@@ -104,7 +106,7 @@ func TestDelete(t *testing.T) { ...@@ -104,7 +106,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestDelete(validNewNode()) test.TestDelete(validNewNode())
} }
...@@ -112,7 +114,7 @@ func TestGet(t *testing.T) { ...@@ -112,7 +114,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestGet(validNewNode()) test.TestGet(validNewNode())
} }
...@@ -120,7 +122,7 @@ func TestList(t *testing.T) { ...@@ -120,7 +122,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestList(validNewNode()) test.TestList(validNewNode())
} }
...@@ -128,7 +130,7 @@ func TestWatch(t *testing.T) { ...@@ -128,7 +130,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestWatch( test.TestWatch(
validNewNode(), validNewNode(),
// matching labels // matching labels
......
pkg/registry/core/persistentvolume/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/persistentvolume/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/persistentvolume/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
...@@ -23,6 +24,7 @@ go_test( ...@@ -23,6 +24,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//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/endpoints/request:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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/registry/rest:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
......
pkg/registry/core/persistentvolume/storage/storage_test.go
View file @ c7e7b928
...@@ -28,8 +28,10 @@ import ( ...@@ -28,8 +28,10 @@ import (
"k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/diff"
genericapirequest "k8s.io/apiserver/pkg/endpoints/request" genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -85,7 +87,7 @@ func TestCreate(t *testing.T) { ...@@ -85,7 +87,7 @@ func TestCreate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
pv := validNewPersistentVolume("foo") pv := validNewPersistentVolume("foo")
pv.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"} pv.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"}
test.TestCreate( test.TestCreate(
...@@ -102,7 +104,7 @@ func TestUpdate(t *testing.T) { ...@@ -102,7 +104,7 @@ func TestUpdate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewPersistentVolume("foo"), validNewPersistentVolume("foo"),
...@@ -121,7 +123,7 @@ func TestDelete(t *testing.T) { ...@@ -121,7 +123,7 @@ func TestDelete(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope().ReturnDeletedObject() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope().ReturnDeletedObject()
test.TestDelete(validNewPersistentVolume("foo")) test.TestDelete(validNewPersistentVolume("foo"))
} }
...@@ -129,7 +131,7 @@ func TestGet(t *testing.T) { ...@@ -129,7 +131,7 @@ func TestGet(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestGet(validNewPersistentVolume("foo")) test.TestGet(validNewPersistentVolume("foo"))
} }
...@@ -137,7 +139,7 @@ func TestList(t *testing.T) { ...@@ -137,7 +139,7 @@ func TestList(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestList(validNewPersistentVolume("foo")) test.TestList(validNewPersistentVolume("foo"))
} }
...@@ -145,7 +147,7 @@ func TestWatch(t *testing.T) { ...@@ -145,7 +147,7 @@ func TestWatch(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestWatch( test.TestWatch(
validNewPersistentVolume("foo"), validNewPersistentVolume("foo"),
// matching labels // matching labels
......
pkg/registry/core/persistentvolumeclaim/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/persistentvolumeclaim/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/persistentvolumeclaim/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
...@@ -23,6 +24,7 @@ go_test( ...@@ -23,6 +24,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//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/endpoints/request:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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/registry/rest:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
......
pkg/registry/core/persistentvolumeclaim/storage/storage_test.go
View file @ c7e7b928
...@@ -28,8 +28,10 @@ import ( ...@@ -28,8 +28,10 @@ import (
"k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/diff"
genericapirequest "k8s.io/apiserver/pkg/endpoints/request" genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -71,7 +73,7 @@ func TestCreate(t *testing.T) { ...@@ -71,7 +73,7 @@ func TestCreate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
pv := validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault) pv := validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault)
pv.ObjectMeta = metav1.ObjectMeta{} pv.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -88,7 +90,7 @@ func TestUpdate(t *testing.T) { ...@@ -88,7 +90,7 @@ func TestUpdate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault), validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault),
...@@ -105,7 +107,7 @@ func TestDelete(t *testing.T) { ...@@ -105,7 +107,7 @@ func TestDelete(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ReturnDeletedObject() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ReturnDeletedObject()
test.TestDelete(validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault)) test.TestDelete(validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault))
} }
...@@ -113,7 +115,7 @@ func TestGet(t *testing.T) { ...@@ -113,7 +115,7 @@ func TestGet(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestGet(validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault)) test.TestGet(validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault))
} }
...@@ -121,7 +123,7 @@ func TestList(t *testing.T) { ...@@ -121,7 +123,7 @@ func TestList(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestList(validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault)) test.TestList(validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault))
} }
...@@ -129,7 +131,7 @@ func TestWatch(t *testing.T) { ...@@ -129,7 +131,7 @@ func TestWatch(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault), validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault),
// matching labels // matching labels
......
pkg/registry/core/pod/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/pod/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/pod/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//pkg/securitycontext:go_default_library", "//pkg/securitycontext:go_default_library",
...@@ -28,6 +29,7 @@ go_test( ...@@ -28,6 +29,7 @@ go_test(
"//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library", "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library",
"//vendor/k8s.io/apiserver/pkg/features: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: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/registry/rest:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage/errors:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/errors:go_default_library",
......
pkg/registry/core/pod/storage/storage_test.go
View file @ c7e7b928
...@@ -34,12 +34,14 @@ import ( ...@@ -34,12 +34,14 @@ import (
genericapirequest "k8s.io/apiserver/pkg/endpoints/request" genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/features" "k8s.io/apiserver/pkg/features"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
"k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage"
storeerr "k8s.io/apiserver/pkg/storage/errors" storeerr "k8s.io/apiserver/pkg/storage/errors"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature"
utilfeaturetesting "k8s.io/apiserver/pkg/util/feature/testing" utilfeaturetesting "k8s.io/apiserver/pkg/util/feature/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
"k8s.io/kubernetes/pkg/securitycontext" "k8s.io/kubernetes/pkg/securitycontext"
...@@ -98,7 +100,7 @@ func TestCreate(t *testing.T) { ...@@ -98,7 +100,7 @@ func TestCreate(t *testing.T) {
storage, _, _, server := newStorage(t) storage, _, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
pod := validNewPod() pod := validNewPod()
pod.ObjectMeta = metav1.ObjectMeta{} pod.ObjectMeta = metav1.ObjectMeta{}
// Make an invalid pod with an an incorrect label. // Make an invalid pod with an an incorrect label.
...@@ -125,7 +127,7 @@ func TestUpdate(t *testing.T) { ...@@ -125,7 +127,7 @@ func TestUpdate(t *testing.T) {
storage, _, _, server := newStorage(t) storage, _, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewPod(), validNewPod(),
...@@ -142,7 +144,7 @@ func TestDelete(t *testing.T) { ...@@ -142,7 +144,7 @@ func TestDelete(t *testing.T) {
storage, _, _, server := newStorage(t) storage, _, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ReturnDeletedObject() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ReturnDeletedObject()
test.TestDelete(validNewPod()) test.TestDelete(validNewPod())
scheduledPod := validNewPod() scheduledPod := validNewPod()
...@@ -366,7 +368,7 @@ func TestGet(t *testing.T) { ...@@ -366,7 +368,7 @@ func TestGet(t *testing.T) {
storage, _, _, server := newStorage(t) storage, _, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestGet(validNewPod()) test.TestGet(validNewPod())
} }
...@@ -374,7 +376,7 @@ func TestList(t *testing.T) { ...@@ -374,7 +376,7 @@ func TestList(t *testing.T) {
storage, _, _, server := newStorage(t) storage, _, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestList(validNewPod()) test.TestList(validNewPod())
} }
...@@ -382,7 +384,7 @@ func TestWatch(t *testing.T) { ...@@ -382,7 +384,7 @@ func TestWatch(t *testing.T) {
storage, _, _, server := newStorage(t) storage, _, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validNewPod(), validNewPod(),
// matching labels // matching labels
......
pkg/registry/core/podtemplate/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/podtemplate/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/podtemplate/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest: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/apis/meta/v1:go_default_library",
...@@ -19,6 +20,7 @@ go_test( ...@@ -19,6 +20,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/labels: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/runtime:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
) )
......
pkg/registry/core/podtemplate/storage/storage_test.go
View file @ c7e7b928
...@@ -24,7 +24,9 @@ import ( ...@@ -24,7 +24,9 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -72,7 +74,7 @@ func TestCreate(t *testing.T) { ...@@ -72,7 +74,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
pod := validNewPodTemplate("foo") pod := validNewPodTemplate("foo")
pod.ObjectMeta = metav1.ObjectMeta{} pod.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -89,7 +91,7 @@ func TestUpdate(t *testing.T) { ...@@ -89,7 +91,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestUpdate( test.TestUpdate(
//valid //valid
validNewPodTemplate("foo"), validNewPodTemplate("foo"),
...@@ -106,7 +108,7 @@ func TestDelete(t *testing.T) { ...@@ -106,7 +108,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ReturnDeletedObject() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ReturnDeletedObject()
test.TestDelete(validNewPodTemplate("foo")) test.TestDelete(validNewPodTemplate("foo"))
} }
...@@ -114,7 +116,7 @@ func TestGet(t *testing.T) { ...@@ -114,7 +116,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestGet(validNewPodTemplate("foo")) test.TestGet(validNewPodTemplate("foo"))
} }
...@@ -122,7 +124,7 @@ func TestList(t *testing.T) { ...@@ -122,7 +124,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestList(validNewPodTemplate("foo")) test.TestList(validNewPodTemplate("foo"))
} }
...@@ -130,7 +132,7 @@ func TestWatch(t *testing.T) { ...@@ -130,7 +132,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validNewPodTemplate("foo"), validNewPodTemplate("foo"),
// matching labels // matching labels
......
pkg/registry/core/replicationcontroller/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/replicationcontroller/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/replicationcontroller/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
...@@ -24,6 +25,7 @@ go_test( ...@@ -24,6 +25,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//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/endpoints/request:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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/registry/rest:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
......
pkg/registry/core/replicationcontroller/storage/storage_test.go
View file @ c7e7b928
...@@ -28,8 +28,10 @@ import ( ...@@ -28,8 +28,10 @@ import (
"k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/diff"
genericapirequest "k8s.io/apiserver/pkg/endpoints/request" genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
...@@ -98,7 +100,7 @@ func TestCreate(t *testing.T) { ...@@ -98,7 +100,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Controller.Store.DestroyFunc() defer storage.Controller.Store.DestroyFunc()
test := registrytest.New(t, storage.Controller.Store) test := genericregistrytest.New(t, storage.Controller.Store, legacyscheme.Scheme)
controller := validNewController() controller := validNewController()
controller.ObjectMeta = metav1.ObjectMeta{} controller.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -119,7 +121,7 @@ func TestUpdate(t *testing.T) { ...@@ -119,7 +121,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Controller.Store.DestroyFunc() defer storage.Controller.Store.DestroyFunc()
test := registrytest.New(t, storage.Controller.Store) test := genericregistrytest.New(t, storage.Controller.Store, legacyscheme.Scheme)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewController(), validNewController(),
...@@ -147,7 +149,7 @@ func TestDelete(t *testing.T) { ...@@ -147,7 +149,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Controller.Store.DestroyFunc() defer storage.Controller.Store.DestroyFunc()
test := registrytest.New(t, storage.Controller.Store) test := genericregistrytest.New(t, storage.Controller.Store, legacyscheme.Scheme)
test.TestDelete(validNewController()) test.TestDelete(validNewController())
} }
...@@ -206,7 +208,7 @@ func TestGet(t *testing.T) { ...@@ -206,7 +208,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Controller.Store.DestroyFunc() defer storage.Controller.Store.DestroyFunc()
test := registrytest.New(t, storage.Controller.Store) test := genericregistrytest.New(t, storage.Controller.Store, legacyscheme.Scheme)
test.TestGet(validNewController()) test.TestGet(validNewController())
} }
...@@ -214,7 +216,7 @@ func TestList(t *testing.T) { ...@@ -214,7 +216,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Controller.Store.DestroyFunc() defer storage.Controller.Store.DestroyFunc()
test := registrytest.New(t, storage.Controller.Store) test := genericregistrytest.New(t, storage.Controller.Store, legacyscheme.Scheme)
test.TestList(validNewController()) test.TestList(validNewController())
} }
...@@ -222,7 +224,7 @@ func TestWatch(t *testing.T) { ...@@ -222,7 +224,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Controller.Store.DestroyFunc() defer storage.Controller.Store.DestroyFunc()
test := registrytest.New(t, storage.Controller.Store) test := genericregistrytest.New(t, storage.Controller.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validController, validController,
// matching labels // matching labels
......
pkg/registry/core/resourcequota/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/resourcequota/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/resourcequota/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
...@@ -22,6 +23,7 @@ go_test( ...@@ -22,6 +23,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//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/endpoints/request:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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/registry/rest:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
......
pkg/registry/core/resourcequota/storage/storage_test.go
View file @ c7e7b928
...@@ -27,8 +27,10 @@ import ( ...@@ -27,8 +27,10 @@ import (
"k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/diff"
genericapirequest "k8s.io/apiserver/pkg/endpoints/request" genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -68,7 +70,7 @@ func TestCreate(t *testing.T) { ...@@ -68,7 +70,7 @@ func TestCreate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
resourcequota := validNewResourceQuota() resourcequota := validNewResourceQuota()
resourcequota.ObjectMeta = metav1.ObjectMeta{} resourcequota.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -109,7 +111,7 @@ func TestDelete(t *testing.T) { ...@@ -109,7 +111,7 @@ func TestDelete(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ReturnDeletedObject() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ReturnDeletedObject()
test.TestDelete(validNewResourceQuota()) test.TestDelete(validNewResourceQuota())
} }
...@@ -117,7 +119,7 @@ func TestGet(t *testing.T) { ...@@ -117,7 +119,7 @@ func TestGet(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestGet(validNewResourceQuota()) test.TestGet(validNewResourceQuota())
} }
...@@ -125,7 +127,7 @@ func TestList(t *testing.T) { ...@@ -125,7 +127,7 @@ func TestList(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestList(validNewResourceQuota()) test.TestList(validNewResourceQuota())
} }
...@@ -133,7 +135,7 @@ func TestWatch(t *testing.T) { ...@@ -133,7 +135,7 @@ func TestWatch(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validNewResourceQuota(), validNewResourceQuota(),
// matching labels // matching labels
......
pkg/registry/core/secret/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/secret/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/secret/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest: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/apis/meta/v1:go_default_library",
...@@ -19,6 +20,7 @@ go_test( ...@@ -19,6 +20,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/labels: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/runtime:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
) )
......
pkg/registry/core/secret/storage/storage_test.go
View file @ c7e7b928
...@@ -24,7 +24,9 @@ import ( ...@@ -24,7 +24,9 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -56,7 +58,7 @@ func TestCreate(t *testing.T) { ...@@ -56,7 +58,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
secret := validNewSecret("foo") secret := validNewSecret("foo")
secret.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo-"} secret.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo-"}
test.TestCreate( test.TestCreate(
...@@ -79,7 +81,7 @@ func TestUpdate(t *testing.T) { ...@@ -79,7 +81,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewSecret("foo"), validNewSecret("foo"),
...@@ -96,7 +98,7 @@ func TestDelete(t *testing.T) { ...@@ -96,7 +98,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestDelete(validNewSecret("foo")) test.TestDelete(validNewSecret("foo"))
} }
...@@ -104,7 +106,7 @@ func TestGet(t *testing.T) { ...@@ -104,7 +106,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestGet(validNewSecret("foo")) test.TestGet(validNewSecret("foo"))
} }
...@@ -112,7 +114,7 @@ func TestList(t *testing.T) { ...@@ -112,7 +114,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestList(validNewSecret("foo")) test.TestList(validNewSecret("foo"))
} }
...@@ -120,7 +122,7 @@ func TestWatch(t *testing.T) { ...@@ -120,7 +122,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validNewSecret("foo"), validNewSecret("foo"),
// matching labels // matching labels
......
pkg/registry/core/service/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/service/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/service/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest: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/apis/meta/v1:go_default_library",
...@@ -20,6 +21,7 @@ go_test( ...@@ -20,6 +21,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/intstr: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: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", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
) )
......
pkg/registry/core/service/storage/storage_test.go
View file @ c7e7b928
...@@ -25,7 +25,9 @@ import ( ...@@ -25,7 +25,9 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -66,7 +68,7 @@ func TestCreate(t *testing.T) { ...@@ -66,7 +68,7 @@ func TestCreate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
validService := validService() validService := validService()
validService.ObjectMeta = metav1.ObjectMeta{} validService.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -97,7 +99,7 @@ func TestUpdate(t *testing.T) { ...@@ -97,7 +99,7 @@ func TestUpdate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).AllowCreateOnUpdate() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate()
test.TestUpdate( test.TestUpdate(
// valid // valid
validService(), validService(),
...@@ -124,7 +126,7 @@ func TestDelete(t *testing.T) { ...@@ -124,7 +126,7 @@ func TestDelete(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).AllowCreateOnUpdate() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate()
test.TestDelete(validService()) test.TestDelete(validService())
} }
...@@ -132,7 +134,7 @@ func TestGet(t *testing.T) { ...@@ -132,7 +134,7 @@ func TestGet(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).AllowCreateOnUpdate() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate()
test.TestGet(validService()) test.TestGet(validService())
} }
...@@ -140,7 +142,7 @@ func TestList(t *testing.T) { ...@@ -140,7 +142,7 @@ func TestList(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).AllowCreateOnUpdate() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate()
test.TestList(validService()) test.TestList(validService())
} }
...@@ -148,7 +150,7 @@ func TestWatch(t *testing.T) { ...@@ -148,7 +150,7 @@ func TestWatch(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validService(), validService(),
// matching labels // matching labels
......
pkg/registry/core/serviceaccount/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/serviceaccount/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/serviceaccount/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest: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/apis/meta/v1:go_default_library",
...@@ -19,6 +20,7 @@ go_test( ...@@ -19,6 +20,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/labels: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/runtime:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
) )
......
pkg/registry/core/serviceaccount/storage/storage_test.go
View file @ c7e7b928
...@@ -24,7 +24,9 @@ import ( ...@@ -24,7 +24,9 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -54,7 +56,7 @@ func TestCreate(t *testing.T) { ...@@ -54,7 +56,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
serviceAccount := validNewServiceAccount("foo") serviceAccount := validNewServiceAccount("foo")
serviceAccount.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo-"} serviceAccount.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo-"}
test.TestCreate( test.TestCreate(
...@@ -72,7 +74,7 @@ func TestUpdate(t *testing.T) { ...@@ -72,7 +74,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewServiceAccount("foo"), validNewServiceAccount("foo"),
...@@ -89,7 +91,7 @@ func TestDelete(t *testing.T) { ...@@ -89,7 +91,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ReturnDeletedObject() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ReturnDeletedObject()
test.TestDelete(validNewServiceAccount("foo")) test.TestDelete(validNewServiceAccount("foo"))
} }
...@@ -97,7 +99,7 @@ func TestGet(t *testing.T) { ...@@ -97,7 +99,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestGet(validNewServiceAccount("foo")) test.TestGet(validNewServiceAccount("foo"))
} }
...@@ -105,7 +107,7 @@ func TestList(t *testing.T) { ...@@ -105,7 +107,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestList(validNewServiceAccount("foo")) test.TestList(validNewServiceAccount("foo"))
} }
...@@ -113,7 +115,7 @@ func TestWatch(t *testing.T) { ...@@ -113,7 +115,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validNewServiceAccount("foo"), validNewServiceAccount("foo"),
// matching labels // matching labels
......
pkg/registry/extensions/daemonset/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage", importpath = "k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
...@@ -20,6 +21,7 @@ go_test( ...@@ -20,6 +21,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/labels: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/runtime:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
) )
......
pkg/registry/extensions/daemonset/storage/storage_test.go
View file @ c7e7b928
...@@ -24,7 +24,9 @@ import ( ...@@ -24,7 +24,9 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
...@@ -80,7 +82,7 @@ func TestCreate(t *testing.T) { ...@@ -80,7 +82,7 @@ func TestCreate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
ds := newValidDaemonSet() ds := newValidDaemonSet()
ds.ObjectMeta = metav1.ObjectMeta{} ds.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -107,7 +109,7 @@ func TestUpdate(t *testing.T) { ...@@ -107,7 +109,7 @@ func TestUpdate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestUpdate( test.TestUpdate(
// valid // valid
newValidDaemonSet(), newValidDaemonSet(),
...@@ -136,7 +138,7 @@ func TestDelete(t *testing.T) { ...@@ -136,7 +138,7 @@ func TestDelete(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestDelete(newValidDaemonSet()) test.TestDelete(newValidDaemonSet())
} }
...@@ -144,7 +146,7 @@ func TestGet(t *testing.T) { ...@@ -144,7 +146,7 @@ func TestGet(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestGet(newValidDaemonSet()) test.TestGet(newValidDaemonSet())
} }
...@@ -152,7 +154,7 @@ func TestList(t *testing.T) { ...@@ -152,7 +154,7 @@ func TestList(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestList(newValidDaemonSet()) test.TestList(newValidDaemonSet())
} }
...@@ -160,7 +162,7 @@ func TestWatch(t *testing.T) { ...@@ -160,7 +162,7 @@ func TestWatch(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validDaemonSet, validDaemonSet,
// matching labels // matching labels
......
pkg/registry/extensions/deployment/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage", importpath = "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions:go_default_library",
...@@ -26,6 +27,7 @@ go_test( ...@@ -26,6 +27,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//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/endpoints/request:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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/registry/rest:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage/errors:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/errors:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
......
pkg/registry/extensions/deployment/storage/storage_test.go
View file @ c7e7b928
...@@ -31,9 +31,11 @@ import ( ...@@ -31,9 +31,11 @@ import (
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
genericapirequest "k8s.io/apiserver/pkg/endpoints/request" genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
storeerr "k8s.io/apiserver/pkg/storage/errors" storeerr "k8s.io/apiserver/pkg/storage/errors"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
...@@ -98,7 +100,7 @@ func TestCreate(t *testing.T) { ...@@ -98,7 +100,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Deployment.Store.DestroyFunc() defer storage.Deployment.Store.DestroyFunc()
test := registrytest.New(t, storage.Deployment.Store) test := genericregistrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme)
deployment := validNewDeployment() deployment := validNewDeployment()
deployment.ObjectMeta = metav1.ObjectMeta{} deployment.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -118,7 +120,7 @@ func TestUpdate(t *testing.T) { ...@@ -118,7 +120,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Deployment.Store.DestroyFunc() defer storage.Deployment.Store.DestroyFunc()
test := registrytest.New(t, storage.Deployment.Store) test := genericregistrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewDeployment(), validNewDeployment(),
...@@ -151,7 +153,7 @@ func TestDelete(t *testing.T) { ...@@ -151,7 +153,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Deployment.Store.DestroyFunc() defer storage.Deployment.Store.DestroyFunc()
test := registrytest.New(t, storage.Deployment.Store) test := genericregistrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme)
test.TestDelete(validNewDeployment()) test.TestDelete(validNewDeployment())
} }
...@@ -159,7 +161,7 @@ func TestGet(t *testing.T) { ...@@ -159,7 +161,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Deployment.Store.DestroyFunc() defer storage.Deployment.Store.DestroyFunc()
test := registrytest.New(t, storage.Deployment.Store) test := genericregistrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme)
test.TestGet(validNewDeployment()) test.TestGet(validNewDeployment())
} }
...@@ -167,7 +169,7 @@ func TestList(t *testing.T) { ...@@ -167,7 +169,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Deployment.Store.DestroyFunc() defer storage.Deployment.Store.DestroyFunc()
test := registrytest.New(t, storage.Deployment.Store) test := genericregistrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme)
test.TestList(validNewDeployment()) test.TestList(validNewDeployment())
} }
...@@ -175,7 +177,7 @@ func TestWatch(t *testing.T) { ...@@ -175,7 +177,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Deployment.Store.DestroyFunc() defer storage.Deployment.Store.DestroyFunc()
test := registrytest.New(t, storage.Deployment.Store) test := genericregistrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validNewDeployment(), validNewDeployment(),
// matching labels // matching labels
......
pkg/registry/extensions/ingress/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/extensions/ingress/storage", importpath = "k8s.io/kubernetes/pkg/registry/extensions/ingress/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
...@@ -21,6 +22,7 @@ go_test( ...@@ -21,6 +22,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/intstr: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: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", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
) )
......
pkg/registry/extensions/ingress/storage/storage_test.go
View file @ c7e7b928
...@@ -25,7 +25,9 @@ import ( ...@@ -25,7 +25,9 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
...@@ -122,7 +124,7 @@ func TestCreate(t *testing.T) { ...@@ -122,7 +124,7 @@ func TestCreate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
ingress := validIngress() ingress := validIngress()
noDefaultBackendAndRules := validIngress() noDefaultBackendAndRules := validIngress()
noDefaultBackendAndRules.Spec.Backend = &extensions.IngressBackend{} noDefaultBackendAndRules.Spec.Backend = &extensions.IngressBackend{}
...@@ -142,7 +144,7 @@ func TestUpdate(t *testing.T) { ...@@ -142,7 +144,7 @@ func TestUpdate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestUpdate( test.TestUpdate(
// valid // valid
validIngress(), validIngress(),
...@@ -178,7 +180,7 @@ func TestDelete(t *testing.T) { ...@@ -178,7 +180,7 @@ func TestDelete(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestDelete(validIngress()) test.TestDelete(validIngress())
} }
...@@ -186,7 +188,7 @@ func TestGet(t *testing.T) { ...@@ -186,7 +188,7 @@ func TestGet(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestGet(validIngress()) test.TestGet(validIngress())
} }
...@@ -194,7 +196,7 @@ func TestList(t *testing.T) { ...@@ -194,7 +196,7 @@ func TestList(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestList(validIngress()) test.TestList(validIngress())
} }
...@@ -202,7 +204,7 @@ func TestWatch(t *testing.T) { ...@@ -202,7 +204,7 @@ func TestWatch(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validIngress(), validIngress(),
// matching labels // matching labels
......
pkg/registry/extensions/podsecuritypolicy/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy/storage", importpath = "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library", "//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
...@@ -20,6 +21,7 @@ go_test( ...@@ -20,6 +21,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/labels: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/runtime:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
) )
......
pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go
View file @ c7e7b928
...@@ -20,6 +20,7 @@ import ( ...@@ -20,6 +20,7 @@ import (
"testing" "testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
// Ensure that extensions/v1beta1 package is initialized. // Ensure that extensions/v1beta1 package is initialized.
_ "k8s.io/api/extensions/v1beta1" _ "k8s.io/api/extensions/v1beta1"
...@@ -27,6 +28,7 @@ import ( ...@@ -27,6 +28,7 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -68,7 +70,7 @@ func TestCreate(t *testing.T) { ...@@ -68,7 +70,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
psp := validNewPodSecurityPolicy() psp := validNewPodSecurityPolicy()
psp.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo-"} psp.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo-"}
test.TestCreate( test.TestCreate(
...@@ -85,7 +87,7 @@ func TestUpdate(t *testing.T) { ...@@ -85,7 +87,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewPodSecurityPolicy(), validNewPodSecurityPolicy(),
...@@ -102,7 +104,7 @@ func TestDelete(t *testing.T) { ...@@ -102,7 +104,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope().ReturnDeletedObject() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope().ReturnDeletedObject()
test.TestDelete(validNewPodSecurityPolicy()) test.TestDelete(validNewPodSecurityPolicy())
} }
...@@ -110,7 +112,7 @@ func TestGet(t *testing.T) { ...@@ -110,7 +112,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestGet(validNewPodSecurityPolicy()) test.TestGet(validNewPodSecurityPolicy())
} }
...@@ -118,7 +120,7 @@ func TestList(t *testing.T) { ...@@ -118,7 +120,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestList(validNewPodSecurityPolicy()) test.TestList(validNewPodSecurityPolicy())
} }
...@@ -126,7 +128,7 @@ func TestWatch(t *testing.T) { ...@@ -126,7 +128,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestWatch( test.TestWatch(
validNewPodSecurityPolicy(), validNewPodSecurityPolicy(),
// matching labels // matching labels
......
pkg/registry/extensions/replicaset/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/extensions/replicaset/storage", importpath = "k8s.io/kubernetes/pkg/registry/extensions/replicaset/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions:go_default_library",
...@@ -25,6 +26,7 @@ go_test( ...@@ -25,6 +26,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//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/endpoints/request:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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/registry/rest:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
......
pkg/registry/extensions/replicaset/storage/storage_test.go
View file @ c7e7b928
...@@ -28,8 +28,10 @@ import ( ...@@ -28,8 +28,10 @@ import (
"k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/diff"
genericapirequest "k8s.io/apiserver/pkg/endpoints/request" genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
...@@ -95,7 +97,7 @@ func TestCreate(t *testing.T) { ...@@ -95,7 +97,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.ReplicaSet.Store.DestroyFunc() defer storage.ReplicaSet.Store.DestroyFunc()
test := registrytest.New(t, storage.ReplicaSet.Store) test := genericregistrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme)
rs := validNewReplicaSet() rs := validNewReplicaSet()
rs.ObjectMeta = metav1.ObjectMeta{} rs.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -116,7 +118,7 @@ func TestUpdate(t *testing.T) { ...@@ -116,7 +118,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.ReplicaSet.Store.DestroyFunc() defer storage.ReplicaSet.Store.DestroyFunc()
test := registrytest.New(t, storage.ReplicaSet.Store) test := genericregistrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewReplicaSet(), validNewReplicaSet(),
...@@ -144,7 +146,7 @@ func TestDelete(t *testing.T) { ...@@ -144,7 +146,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.ReplicaSet.Store.DestroyFunc() defer storage.ReplicaSet.Store.DestroyFunc()
test := registrytest.New(t, storage.ReplicaSet.Store) test := genericregistrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme)
test.TestDelete(validNewReplicaSet()) test.TestDelete(validNewReplicaSet())
} }
...@@ -203,7 +205,7 @@ func TestGet(t *testing.T) { ...@@ -203,7 +205,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.ReplicaSet.Store.DestroyFunc() defer storage.ReplicaSet.Store.DestroyFunc()
test := registrytest.New(t, storage.ReplicaSet.Store) test := genericregistrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme)
test.TestGet(validNewReplicaSet()) test.TestGet(validNewReplicaSet())
} }
...@@ -211,7 +213,7 @@ func TestList(t *testing.T) { ...@@ -211,7 +213,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.ReplicaSet.Store.DestroyFunc() defer storage.ReplicaSet.Store.DestroyFunc()
test := registrytest.New(t, storage.ReplicaSet.Store) test := genericregistrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme)
test.TestList(validNewReplicaSet()) test.TestList(validNewReplicaSet())
} }
...@@ -219,7 +221,7 @@ func TestWatch(t *testing.T) { ...@@ -219,7 +221,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.ReplicaSet.Store.DestroyFunc() defer storage.ReplicaSet.Store.DestroyFunc()
test := registrytest.New(t, storage.ReplicaSet.Store) test := genericregistrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validNewReplicaSet(), validNewReplicaSet(),
// matching labels // matching labels
......
pkg/registry/networking/networkpolicy/storage/BUILD
View file @ c7e7b928
...@@ -39,6 +39,7 @@ go_test( ...@@ -39,6 +39,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/networking/networkpolicy/storage", importpath = "k8s.io/kubernetes/pkg/registry/networking/networkpolicy/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/apis/networking:go_default_library", "//pkg/apis/networking:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
...@@ -48,6 +49,7 @@ go_test( ...@@ -48,6 +49,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/intstr: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: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", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
) )
pkg/registry/networking/networkpolicy/storage/storage_test.go
View file @ c7e7b928
...@@ -25,7 +25,9 @@ import ( ...@@ -25,7 +25,9 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/networking" "k8s.io/kubernetes/pkg/apis/networking"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
...@@ -71,7 +73,7 @@ func TestCreate(t *testing.T) { ...@@ -71,7 +73,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
np := validNetworkPolicy() np := validNetworkPolicy()
np.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo-"} np.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo-"}
test.TestCreate( test.TestCreate(
...@@ -89,7 +91,7 @@ func TestUpdate(t *testing.T) { ...@@ -89,7 +91,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNetworkPolicy(), validNetworkPolicy(),
...@@ -132,7 +134,7 @@ func TestDelete(t *testing.T) { ...@@ -132,7 +134,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestDelete(validNetworkPolicy()) test.TestDelete(validNetworkPolicy())
} }
...@@ -140,7 +142,7 @@ func TestGet(t *testing.T) { ...@@ -140,7 +142,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestGet(validNetworkPolicy()) test.TestGet(validNetworkPolicy())
} }
...@@ -148,7 +150,7 @@ func TestList(t *testing.T) { ...@@ -148,7 +150,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestList(validNetworkPolicy()) test.TestList(validNetworkPolicy())
} }
...@@ -156,7 +158,7 @@ func TestWatch(t *testing.T) { ...@@ -156,7 +158,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validNetworkPolicy(), validNetworkPolicy(),
// matching labels // matching labels
......
pkg/registry/policy/poddisruptionbudget/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget/storage", importpath = "k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/policy:go_default_library", "//pkg/apis/policy:go_default_library",
"//pkg/registry/registrytest: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/apis/meta/v1:go_default_library",
...@@ -20,6 +21,7 @@ go_test( ...@@ -20,6 +21,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//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/endpoints/request:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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/registry/rest:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
......
pkg/registry/policy/poddisruptionbudget/storage/storage_test.go
View file @ c7e7b928
...@@ -25,8 +25,10 @@ import ( ...@@ -25,8 +25,10 @@ import (
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
genericapirequest "k8s.io/apiserver/pkg/endpoints/request" genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/apis/policy"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -69,7 +71,7 @@ func TestCreate(t *testing.T) { ...@@ -69,7 +71,7 @@ func TestCreate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
pdb := validNewPodDisruptionBudget() pdb := validNewPodDisruptionBudget()
pdb.ObjectMeta = metav1.ObjectMeta{} pdb.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -130,7 +132,7 @@ func TestGet(t *testing.T) { ...@@ -130,7 +132,7 @@ func TestGet(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestGet(validNewPodDisruptionBudget()) test.TestGet(validNewPodDisruptionBudget())
} }
...@@ -138,7 +140,7 @@ func TestList(t *testing.T) { ...@@ -138,7 +140,7 @@ func TestList(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestList(validNewPodDisruptionBudget()) test.TestList(validNewPodDisruptionBudget())
} }
...@@ -146,7 +148,7 @@ func TestDelete(t *testing.T) { ...@@ -146,7 +148,7 @@ func TestDelete(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestDelete(validNewPodDisruptionBudget()) test.TestDelete(validNewPodDisruptionBudget())
} }
...@@ -154,7 +156,7 @@ func TestWatch(t *testing.T) { ...@@ -154,7 +156,7 @@ func TestWatch(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validNewPodDisruptionBudget(), validNewPodDisruptionBudget(),
// matching labels // matching labels
......
pkg/registry/registrytest/BUILD
View file @ c7e7b928
...@@ -19,26 +19,18 @@ go_library( ...@@ -19,26 +19,18 @@ go_library(
], ],
importpath = "k8s.io/kubernetes/pkg/registry/registrytest", importpath = "k8s.io/kubernetes/pkg/registry/registrytest",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/api/testapi:go_default_library", "//pkg/api/testapi:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/util/slice: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/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/internalversion:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1: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/apimachinery/pkg/watch:go_default_library",
"//vendor/k8s.io/apiserver/pkg/endpoints/request: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/generic/registry:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/rest: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/etcd/testing:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage/storagebackend:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/storagebackend:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage/testing:go_default_library",
], ],
) )
......
pkg/registry/registrytest/etcd.go
View file @ c7e7b928
...@@ -17,25 +17,11 @@ limitations under the License. ...@@ -17,25 +17,11 @@ limitations under the License.
package registrytest package registrytest
import ( import (
"fmt"
"testing" "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" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/apiserver/pkg/storage/storagebackend"
storagetesting "k8s.io/apiserver/pkg/storage/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/testapi"
api "k8s.io/kubernetes/pkg/apis/core"
) )
func NewEtcdStorage(t *testing.T, group string) (*storagebackend.Config, *etcdtesting.EtcdTestServer) { func NewEtcdStorage(t *testing.T, group string) (*storagebackend.Config, *etcdtesting.EtcdTestServer) {
...@@ -43,194 +29,3 @@ func NewEtcdStorage(t *testing.T, group string) (*storagebackend.Config, *etcdte ...@@ -43,194 +29,3 @@ func NewEtcdStorage(t *testing.T, group string) (*storagebackend.Config, *etcdte
config.Codec = testapi.Groups[group].StorageCodec() config.Codec = testapi.Groups[group].StorageCodec()
return config, server 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) *Tester {
return &Tester{
tester: resttest.New(t, storage, legacyscheme.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},
)
}
// =============================================================================
// get codec based on runtime.Object
func getCodec(obj runtime.Object) (runtime.Codec, error) {
fqKinds, _, err := legacyscheme.Scheme.ObjectKinds(obj)
if err != nil {
return nil, fmt.Errorf("unexpected encoding error: %v", err)
}
fqKind := fqKinds[0]
// TODO: caesarxuchao: we should detect which group an object belongs to
// by using the version returned by Schem.ObjectVersionAndKind() once we
// split the schemes for internal objects.
// TODO: caesarxuchao: we should add a map from kind to group in Scheme.
var codec runtime.Codec
if legacyscheme.Scheme.Recognizes(legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersion.WithKind(fqKind.Kind)) {
codec = testapi.Default.Codec()
} else if legacyscheme.Scheme.Recognizes(testapi.Extensions.GroupVersion().WithKind(fqKind.Kind)) {
codec = testapi.Extensions.Codec()
} else {
return nil, fmt.Errorf("unexpected kind: %v", fqKind)
}
return codec, nil
}
// 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
}
pkg/registry/scheduling/priorityclass/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/scheduling/priorityclass/storage", importpath = "k8s.io/kubernetes/pkg/registry/scheduling/priorityclass/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/scheduling:go_default_library", "//pkg/apis/scheduling:go_default_library",
"//pkg/registry/registrytest: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/apis/meta/v1:go_default_library",
...@@ -19,6 +20,7 @@ go_test( ...@@ -19,6 +20,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/labels: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/runtime:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
) )
......
pkg/registry/scheduling/priorityclass/storage/storage_test.go
View file @ c7e7b928
...@@ -24,7 +24,9 @@ import ( ...@@ -24,7 +24,9 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/scheduling" "k8s.io/kubernetes/pkg/apis/scheduling"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -55,7 +57,7 @@ func TestCreate(t *testing.T) { ...@@ -55,7 +57,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestCreate( test.TestCreate(
validNewPriorityClass(), validNewPriorityClass(),
// invalid cases // invalid cases
...@@ -74,7 +76,7 @@ func TestUpdate(t *testing.T) { ...@@ -74,7 +76,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewPriorityClass(), validNewPriorityClass(),
...@@ -100,7 +102,7 @@ func TestDelete(t *testing.T) { ...@@ -100,7 +102,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestDelete(validNewPriorityClass()) test.TestDelete(validNewPriorityClass())
} }
...@@ -108,7 +110,7 @@ func TestGet(t *testing.T) { ...@@ -108,7 +110,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestGet(validNewPriorityClass()) test.TestGet(validNewPriorityClass())
} }
...@@ -116,7 +118,7 @@ func TestList(t *testing.T) { ...@@ -116,7 +118,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestList(validNewPriorityClass()) test.TestList(validNewPriorityClass())
} }
...@@ -124,7 +126,7 @@ func TestWatch(t *testing.T) { ...@@ -124,7 +126,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestWatch( test.TestWatch(
validNewPriorityClass(), validNewPriorityClass(),
// matching labels // matching labels
......
pkg/registry/settings/podpreset/storage/BUILD
View file @ c7e7b928
...@@ -38,6 +38,7 @@ go_test( ...@@ -38,6 +38,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/settings/podpreset/storage", importpath = "k8s.io/kubernetes/pkg/registry/settings/podpreset/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/apis/settings:go_default_library", "//pkg/apis/settings:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
...@@ -46,6 +47,7 @@ go_test( ...@@ -46,6 +47,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/labels: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/runtime:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
) )
pkg/registry/settings/podpreset/storage/storage_test.go
View file @ c7e7b928
...@@ -24,7 +24,9 @@ import ( ...@@ -24,7 +24,9 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/settings" "k8s.io/kubernetes/pkg/apis/settings"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
...@@ -102,7 +104,7 @@ func TestCreate(t *testing.T) { ...@@ -102,7 +104,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
invalidPodPreset := validNewPodPreset(test.TestNamespace()) invalidPodPreset := validNewPodPreset(test.TestNamespace())
invalidPodPreset.Spec.VolumeMounts[0].Name = "/cache/VolumeMounts" invalidPodPreset.Spec.VolumeMounts[0].Name = "/cache/VolumeMounts"
test.TestCreate( test.TestCreate(
...@@ -116,7 +118,7 @@ func TestUpdate(t *testing.T) { ...@@ -116,7 +118,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewPodPreset(test.TestNamespace()), validNewPodPreset(test.TestNamespace()),
...@@ -133,7 +135,7 @@ func TestDelete(t *testing.T) { ...@@ -133,7 +135,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestDelete(validNewPodPreset(test.TestNamespace())) test.TestDelete(validNewPodPreset(test.TestNamespace()))
} }
...@@ -141,7 +143,7 @@ func TestGet(t *testing.T) { ...@@ -141,7 +143,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestGet(validNewPodPreset(test.TestNamespace())) test.TestGet(validNewPodPreset(test.TestNamespace()))
} }
...@@ -149,7 +151,7 @@ func TestList(t *testing.T) { ...@@ -149,7 +151,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestList(validNewPodPreset(test.TestNamespace())) test.TestList(validNewPodPreset(test.TestNamespace()))
} }
...@@ -157,7 +159,7 @@ func TestWatch(t *testing.T) { ...@@ -157,7 +159,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store) test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestWatch( test.TestWatch(
validNewPodPreset(test.TestNamespace()), validNewPodPreset(test.TestNamespace()),
// matching labels // matching labels
......
pkg/registry/storage/storageclass/storage/BUILD
View file @ c7e7b928
...@@ -12,6 +12,7 @@ go_test( ...@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/storage/storageclass/storage", importpath = "k8s.io/kubernetes/pkg/registry/storage/storageclass/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/apis/storage:go_default_library", "//pkg/apis/storage:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
...@@ -20,6 +21,7 @@ go_test( ...@@ -20,6 +21,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/labels: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/runtime:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
) )
......
pkg/registry/storage/storageclass/storage/storage_test.go
View file @ c7e7b928
...@@ -24,7 +24,9 @@ import ( ...@@ -24,7 +24,9 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
storageapi "k8s.io/kubernetes/pkg/apis/storage" storageapi "k8s.io/kubernetes/pkg/apis/storage"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
...@@ -64,7 +66,7 @@ func TestCreate(t *testing.T) { ...@@ -64,7 +66,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
storageClass := validNewStorageClass("foo") storageClass := validNewStorageClass("foo")
storageClass.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"} storageClass.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"}
deleteReclaimPolicy := api.PersistentVolumeReclaimDelete deleteReclaimPolicy := api.PersistentVolumeReclaimDelete
...@@ -83,7 +85,7 @@ func TestUpdate(t *testing.T) { ...@@ -83,7 +85,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewStorageClass("foo"), validNewStorageClass("foo"),
...@@ -107,7 +109,7 @@ func TestDelete(t *testing.T) { ...@@ -107,7 +109,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope().ReturnDeletedObject() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope().ReturnDeletedObject()
test.TestDelete(validNewStorageClass("foo")) test.TestDelete(validNewStorageClass("foo"))
} }
...@@ -115,7 +117,7 @@ func TestGet(t *testing.T) { ...@@ -115,7 +117,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestGet(validNewStorageClass("foo")) test.TestGet(validNewStorageClass("foo"))
} }
...@@ -123,7 +125,7 @@ func TestList(t *testing.T) { ...@@ -123,7 +125,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestList(validNewStorageClass("foo")) test.TestList(validNewStorageClass("foo"))
} }
...@@ -131,7 +133,7 @@ func TestWatch(t *testing.T) { ...@@ -131,7 +133,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestWatch( test.TestWatch(
validNewStorageClass("foo"), validNewStorageClass("foo"),
// matching labels // matching labels
......
pkg/registry/storage/volumeattachment/storage/BUILD
View file @ c7e7b928
...@@ -20,6 +20,7 @@ go_test( ...@@ -20,6 +20,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/storage/volumeattachment/storage", importpath = "k8s.io/kubernetes/pkg/registry/storage/volumeattachment/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/api/testapi:go_default_library", "//pkg/api/testapi:go_default_library",
"//pkg/apis/storage:go_default_library", "//pkg/apis/storage:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
...@@ -29,6 +30,7 @@ go_test( ...@@ -29,6 +30,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/labels: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/runtime:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic: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", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
], ],
) )
......
pkg/registry/storage/volumeattachment/storage/storage_test.go
View file @ c7e7b928
...@@ -25,7 +25,9 @@ import ( ...@@ -25,7 +25,9 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/testapi"
storageapi "k8s.io/kubernetes/pkg/apis/storage" storageapi "k8s.io/kubernetes/pkg/apis/storage"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
...@@ -72,7 +74,7 @@ func TestCreate(t *testing.T) { ...@@ -72,7 +74,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
volumeAttachment := validNewVolumeAttachment("foo") volumeAttachment := validNewVolumeAttachment("foo")
volumeAttachment.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"} volumeAttachment.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"}
pvName := "foo" pvName := "foo"
...@@ -102,7 +104,7 @@ func TestUpdate(t *testing.T) { ...@@ -102,7 +104,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewVolumeAttachment("foo"), validNewVolumeAttachment("foo"),
...@@ -130,7 +132,7 @@ func TestDelete(t *testing.T) { ...@@ -130,7 +132,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() 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")) test.TestDelete(validNewVolumeAttachment("foo"))
} }
...@@ -143,7 +145,7 @@ func TestGet(t *testing.T) { ...@@ -143,7 +145,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestGet(validNewVolumeAttachment("foo")) test.TestGet(validNewVolumeAttachment("foo"))
} }
...@@ -156,7 +158,7 @@ func TestList(t *testing.T) { ...@@ -156,7 +158,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestList(validNewVolumeAttachment("foo")) test.TestList(validNewVolumeAttachment("foo"))
} }
...@@ -169,7 +171,7 @@ func TestWatch(t *testing.T) { ...@@ -169,7 +171,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope() test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestWatch( test.TestWatch(
validNewVolumeAttachment("foo"), validNewVolumeAttachment("foo"),
// matching labels // matching labels
......
staging/src/k8s.io/apiserver/pkg/registry/generic/BUILD
View file @ c7e7b928
...@@ -39,6 +39,7 @@ filegroup( ...@@ -39,6 +39,7 @@ filegroup(
":package-srcs", ":package-srcs",
"//staging/src/k8s.io/apiserver/pkg/registry/generic/registry:all-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/rest:all-srcs",
"//staging/src/k8s.io/apiserver/pkg/registry/generic/testing:all-srcs",
], ],
tags = ["automanaged"], tags = ["automanaged"],
) )
staging/src/k8s.io/apiserver/pkg/registry/generic/testing/BUILD 0 → 100644
View file @ c7e7b928
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"],
)
staging/src/k8s.io/apiserver/pkg/registry/generic/testing/tester.go 0 → 100644
View file @ c7e7b928
/*
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
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment