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

apiserver: remove unneeded scheme from registry tester

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/registry/storage/storageclass/storage/BUILD
View File

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

13
pkg/registry/storage/storageclass/storage/storage_test.go
View File

@@ -26,7 +26,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"
storageapi "k8s.io/kubernetes/pkg/apis/storage"
"k8s.io/kubernetes/pkg/registry/registrytest"
@@ -66,7 +65,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()
storageClass := validNewStorageClass("foo")
storageClass.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"}
deleteReclaimPolicy := api.PersistentVolumeReclaimDelete
@@ -85,7 +84,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).ClusterScope()
test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestUpdate(
// valid
validNewStorageClass("foo"),
@@ -109,7 +108,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(validNewStorageClass("foo"))
}
@@ -117,7 +116,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(validNewStorageClass("foo"))
}
@@ -125,7 +124,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(validNewStorageClass("foo"))
}
@@ -133,7 +132,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(
validNewStorageClass("foo"),
// matching labels

1
pkg/registry/storage/volumeattachment/storage/BUILD
View File

@@ -20,7 +20,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/storage/volumeattachment/storage",
library = ":go_default_library",
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/api/testapi:go_default_library",
"//pkg/apis/storage:go_default_library",
"//pkg/registry/registrytest:go_default_library",

13
pkg/registry/storage/volumeattachment/storage/storage_test.go
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"
"k8s.io/kubernetes/pkg/api/testapi"
storageapi "k8s.io/kubernetes/pkg/apis/storage"
"k8s.io/kubernetes/pkg/registry/registrytest"
@@ -74,7 +73,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()
volumeAttachment := validNewVolumeAttachment("foo")
volumeAttachment.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"}
pvName := "foo"
@@ -104,7 +103,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).ClusterScope()
test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestUpdate(
// valid
validNewVolumeAttachment("foo"),
@@ -132,7 +131,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(validNewVolumeAttachment("foo"))
}
@@ -145,7 +144,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(validNewVolumeAttachment("foo"))
}
@@ -158,7 +157,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(validNewVolumeAttachment("foo"))
}
@@ -171,7 +170,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(
validNewVolumeAttachment("foo"),
// matching labels