github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-25 12:17:52 +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/batch/cronjob/storage/BUILD
View File

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

13
pkg/registry/batch/cronjob/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"
"k8s.io/kubernetes/pkg/apis/batch"
api "k8s.io/kubernetes/pkg/apis/core"
@@ -75,7 +74,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)
validCronJob := validNewCronJob()
validCronJob.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate(
@@ -97,7 +96,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)
schedule := "1 1 1 1 ?"
test.TestUpdate(
// valid
@@ -126,7 +125,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(validNewCronJob())
}
@@ -139,7 +138,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(validNewCronJob())
}
@@ -152,7 +151,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(validNewCronJob())
}
@@ -165,7 +164,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(
validNewCronJob(),
// matching labels

1
pkg/registry/batch/job/storage/BUILD
View File

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

13
pkg/registry/batch/job/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"
"k8s.io/kubernetes/pkg/apis/batch"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest"
@@ -84,7 +83,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Job.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.Job.Store)
validJob := validNewJob()
validJob.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate(
@@ -105,7 +104,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Job.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.Job.Store)
two := int32(2)
test.TestUpdate(
// valid
@@ -134,7 +133,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Job.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.Job.Store)
test.TestDelete(validNewJob())
}
@@ -142,7 +141,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Job.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.Job.Store)
test.TestGet(validNewJob())
}
@@ -150,7 +149,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Job.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.Job.Store)
test.TestList(validNewJob())
}
@@ -158,7 +157,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Job.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme)
test := genericregistrytest.New(t, storage.Job.Store)
test.TestWatch(
validNewJob(),
// matching labels