github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-25 20:29:56 +00:00
Code Issues Projects Releases Wiki Activity

registry: cut-off kube dependencies from registrytest

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

13
pkg/registry/batch/cronjob/storage/storage_test.go
View File

@@ -26,6 +26,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/api/testapi"
"k8s.io/kubernetes/pkg/apis/batch"
api "k8s.io/kubernetes/pkg/apis/core"
@@ -73,7 +74,7 @@ func TestCreate(t *testing.T) {
storage, _, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store)
test := registrytest.New(t, storage.Store, legacyscheme.Scheme)
validCronJob := validNewCronJob()
validCronJob.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate(
@@ -95,7 +96,7 @@ func TestUpdate(t *testing.T) {
storage, _, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store)
test := registrytest.New(t, storage.Store, legacyscheme.Scheme)
schedule := "1 1 1 1 ?"
test.TestUpdate(
// valid
@@ -124,7 +125,7 @@ func TestDelete(t *testing.T) {
storage, _, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store)
test := registrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestDelete(validNewCronJob())
}
@@ -137,7 +138,7 @@ func TestGet(t *testing.T) {
storage, _, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store)
test := registrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestGet(validNewCronJob())
}
@@ -150,7 +151,7 @@ func TestList(t *testing.T) {
storage, _, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store)
test := registrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestList(validNewCronJob())
}
@@ -163,7 +164,7 @@ func TestWatch(t *testing.T) {
storage, _, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store)
test := registrytest.New(t, storage.Store, legacyscheme.Scheme)
test.TestWatch(
validNewCronJob(),
// matching labels

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