github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-26 04:36:00 +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/extensions/daemonset/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"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/registry/registrytest"
@@ -80,7 +81,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)
ds := newValidDaemonSet()
ds.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate(
@@ -107,7 +108,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)
test.TestUpdate(
// valid
newValidDaemonSet(),
@@ -136,7 +137,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(newValidDaemonSet())
}
@@ -144,7 +145,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(newValidDaemonSet())
}
@@ -152,7 +153,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(newValidDaemonSet())
}
@@ -160,7 +161,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(
validDaemonSet,
// matching labels

13
pkg/registry/extensions/deployment/storage/storage_test.go
View File

@@ -34,6 +34,7 @@ import (
"k8s.io/apiserver/pkg/registry/rest"
storeerr "k8s.io/apiserver/pkg/storage/errors"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/autoscaling"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/extensions"
@@ -98,7 +99,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Deployment.Store.DestroyFunc()
test := registrytest.New(t, storage.Deployment.Store)
test := registrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme)
deployment := validNewDeployment()
deployment.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate(
@@ -118,7 +119,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Deployment.Store.DestroyFunc()
test := registrytest.New(t, storage.Deployment.Store)
test := registrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme)
test.TestUpdate(
// valid
validNewDeployment(),
@@ -151,7 +152,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Deployment.Store.DestroyFunc()
test := registrytest.New(t, storage.Deployment.Store)
test := registrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme)
test.TestDelete(validNewDeployment())
}
@@ -159,7 +160,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Deployment.Store.DestroyFunc()
test := registrytest.New(t, storage.Deployment.Store)
test := registrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme)
test.TestGet(validNewDeployment())
}
@@ -167,7 +168,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Deployment.Store.DestroyFunc()
test := registrytest.New(t, storage.Deployment.Store)
test := registrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme)
test.TestList(validNewDeployment())
}
@@ -175,7 +176,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Deployment.Store.DestroyFunc()
test := registrytest.New(t, storage.Deployment.Store)
test := registrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme)
test.TestWatch(
validNewDeployment(),
// matching labels

13
pkg/registry/extensions/ingress/storage/storage_test.go
View File

@@ -26,6 +26,7 @@ import (
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apiserver/pkg/registry/generic"
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"
@@ -122,7 +123,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)
ingress := validIngress()
noDefaultBackendAndRules := validIngress()
noDefaultBackendAndRules.Spec.Backend = &extensions.IngressBackend{}
@@ -142,7 +143,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)
test.TestUpdate(
// valid
validIngress(),
@@ -178,7 +179,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(validIngress())
}
@@ -186,7 +187,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(validIngress())
}
@@ -194,7 +195,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(validIngress())
}
@@ -202,7 +203,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(
validIngress(),
// matching labels

13
pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go
View File

@@ -20,6 +20,7 @@ import (
"testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/extensions"
// Ensure that extensions/v1beta1 package is initialized.
_ "k8s.io/api/extensions/v1beta1"
@@ -68,7 +69,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
psp := validNewPodSecurityPolicy()
psp.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo-"}
test.TestCreate(
@@ -85,7 +86,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestUpdate(
// valid
validNewPodSecurityPolicy(),
@@ -102,7 +103,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope().ReturnDeletedObject()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope().ReturnDeletedObject()
test.TestDelete(validNewPodSecurityPolicy())
}
@@ -110,7 +111,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestGet(validNewPodSecurityPolicy())
}
@@ -118,7 +119,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestList(validNewPodSecurityPolicy())
}
@@ -126,7 +127,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store).ClusterScope()
test := registrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope()
test.TestWatch(
validNewPodSecurityPolicy(),
// matching labels

13
pkg/registry/extensions/replicaset/storage/storage_test.go
View File

@@ -30,6 +30,7 @@ import (
"k8s.io/apiserver/pkg/registry/generic"
"k8s.io/apiserver/pkg/registry/rest"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/autoscaling"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/extensions"
@@ -95,7 +96,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.ReplicaSet.Store.DestroyFunc()
test := registrytest.New(t, storage.ReplicaSet.Store)
test := registrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme)
rs := validNewReplicaSet()
rs.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate(
@@ -116,7 +117,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.ReplicaSet.Store.DestroyFunc()
test := registrytest.New(t, storage.ReplicaSet.Store)
test := registrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme)
test.TestUpdate(
// valid
validNewReplicaSet(),
@@ -144,7 +145,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.ReplicaSet.Store.DestroyFunc()
test := registrytest.New(t, storage.ReplicaSet.Store)
test := registrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme)
test.TestDelete(validNewReplicaSet())
}
@@ -203,7 +204,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.ReplicaSet.Store.DestroyFunc()
test := registrytest.New(t, storage.ReplicaSet.Store)
test := registrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme)
test.TestGet(validNewReplicaSet())
}
@@ -211,7 +212,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.ReplicaSet.Store.DestroyFunc()
test := registrytest.New(t, storage.ReplicaSet.Store)
test := registrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme)
test.TestList(validNewReplicaSet())
}
@@ -219,7 +220,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.ReplicaSet.Store.DestroyFunc()
test := registrytest.New(t, storage.ReplicaSet.Store)
test := registrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme)
test.TestWatch(
validNewReplicaSet(),
// matching labels