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

@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/namespace/storage",
library = ":go_default_library",
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

View File

@@ -27,7 +27,6 @@ import (
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"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest"
)
@@ -51,7 +50,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).ClusterScope()
test := genericregistrytest.New(t, storage.store).ClusterScope()
namespace := validNewNamespace()
namespace.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"}
test.TestCreate(
@@ -95,7 +94,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).ClusterScope().ReturnDeletedObject()
test := genericregistrytest.New(t, storage.store).ClusterScope().ReturnDeletedObject()
test.TestDelete(validNewNamespace())
}
@@ -103,7 +102,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).ClusterScope()
test := genericregistrytest.New(t, storage.store).ClusterScope()
test.TestGet(validNewNamespace())
}
@@ -111,7 +110,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).ClusterScope()
test := genericregistrytest.New(t, storage.store).ClusterScope()
test.TestList(validNewNamespace())
}
@@ -119,7 +118,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).ClusterScope()
test := genericregistrytest.New(t, storage.store).ClusterScope()
test.TestWatch(
validNewNamespace(),
// matching labels