github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues Projects Releases Wiki Activity

registry: move generic registry tester into k8s.io/apiserver

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2017-11-13 18:07:35 +01:00
parent 3410f536f4
commit 0b100cb69b
68 changed files with 512 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/registry/apps/controllerrevision/storage/BUILD
View File

@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/apps/controllerrevision/storage",
library = ":go_default_library",
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/apps:go_default_library",
"//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library",
@@ -20,6 +21,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
],
)

13
pkg/registry/apps/controllerrevision/storage/storage_test.go
View File

@@ -24,6 +24,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/apps"
@@ -35,7 +36,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
var (
valid = stripObjectMeta(newControllerRevision("validname", metav1.NamespaceDefault, newObject(), 0))
badRevision = stripObjectMeta(newControllerRevision("validname", "validns", newObject(), -1))
@@ -59,7 +60,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
addLabel := func(obj runtime.Object) runtime.Object {
rev := obj.(*apps.ControllerRevision)
@@ -94,7 +95,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestGet(newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0))
}
@@ -102,7 +103,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestList(newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0))
}
@@ -110,7 +111,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestDelete(newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0))
}
@@ -118,7 +119,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestWatch(
newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0),
[]labels.Set{

2
pkg/registry/apps/statefulset/storage/BUILD
View File

@@ -12,6 +12,7 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/apps/statefulset/storage",
library = ":go_default_library",
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/apps:go_default_library",
"//pkg/apis/autoscaling:go_default_library",
"//pkg/apis/core:go_default_library",
@@ -24,6 +25,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library",
"//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic/testing:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
],

11
pkg/registry/apps/statefulset/storage/storage_test.go
View File

@@ -27,6 +27,7 @@ import (
"k8s.io/apimachinery/pkg/util/diff"
genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
"k8s.io/apiserver/pkg/registry/rest"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
@@ -94,7 +95,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.StatefulSet.Store.DestroyFunc()
test := registrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme)
ps := validNewStatefulSet()
ps.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate(
@@ -147,7 +148,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.StatefulSet.Store.DestroyFunc()
test := registrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme)
test.TestGet(validNewStatefulSet())
}
@@ -155,7 +156,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.StatefulSet.Store.DestroyFunc()
test := registrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme)
test.TestList(validNewStatefulSet())
}
@@ -163,7 +164,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.StatefulSet.Store.DestroyFunc()
test := registrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme)
test.TestDelete(validNewStatefulSet())
}
@@ -171,7 +172,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.StatefulSet.Store.DestroyFunc()
test := registrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme)
test.TestWatch(
validNewStatefulSet(),
// matching labels