apiserver: remove unneeded scheme from registry tester

This commit is contained in:
Dr. Stefan Schimanski
2017-11-17 19:46:12 +01:00
parent 56e62b684e
commit d4d53c0e2a
64 changed files with 182 additions and 246 deletions

View File

@@ -27,7 +27,6 @@ import (
"k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/registry/registrytest"
@@ -124,7 +123,7 @@ func TestCreate(t *testing.T) {
storage, _, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.Store)
ingress := validIngress()
noDefaultBackendAndRules := validIngress()
noDefaultBackendAndRules.Spec.Backend = &extensions.IngressBackend{}
@@ -144,7 +143,7 @@ func TestUpdate(t *testing.T) {
storage, _, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.Store)
test.TestUpdate(
// valid
validIngress(),
@@ -180,7 +179,7 @@ func TestDelete(t *testing.T) {
storage, _, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.Store)
test.TestDelete(validIngress())
}
@@ -188,7 +187,7 @@ func TestGet(t *testing.T) {
storage, _, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.Store)
test.TestGet(validIngress())
}
@@ -196,7 +195,7 @@ func TestList(t *testing.T) {
storage, _, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.Store)
test.TestList(validIngress())
}
@@ -204,7 +203,7 @@ func TestWatch(t *testing.T) {
storage, _, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.Store)
test.TestWatch(
validIngress(),
// matching labels