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

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

View File

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

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/scheduling"
@@ -56,7 +57,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestCreate(
validNewPriorityClass(),
// invalid cases
@@ -75,7 +76,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestUpdate(
// valid
validNewPriorityClass(),
@@ -101,7 +102,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestDelete(validNewPriorityClass())
}
@@ -109,7 +110,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestGet(validNewPriorityClass())
}
@@ -117,7 +118,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestList(validNewPriorityClass())
}
@@ -125,7 +126,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestWatch(
validNewPriorityClass(),
// matching labels