registry: cut-off kube dependencies from registrytest

This commit is contained in:
Dr. Stefan Schimanski
2017-11-13 17:55:39 +01:00
parent 6e950cc629
commit 3410f536f4
31 changed files with 205 additions and 200 deletions

View File

@@ -25,6 +25,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/registry/generic"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/scheduling"
"k8s.io/kubernetes/pkg/registry/registrytest"
)
@@ -55,7 +56,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestCreate(
validNewPriorityClass(),
// invalid cases
@@ -74,7 +75,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestUpdate(
// valid
validNewPriorityClass(),
@@ -100,7 +101,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestDelete(validNewPriorityClass())
}
@@ -108,7 +109,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestGet(validNewPriorityClass())
}
@@ -116,7 +117,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestList(validNewPriorityClass())
}
@@ -124,7 +125,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestWatch(
validNewPriorityClass(),
// matching labels