Skip to content

K
k3s
Unverified Commit bebb9c91 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #55963 from sttts/sttts-drop-registrytester-scheme

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. apiserver: remove unneeded scheme from registry tester Follow-up of https://github.com/kubernetes/kubernetes/pull/55622, removing an unused scheme.
parents 142579c1 d4d53c0e
Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 246 deletions
pkg/registry/apps/controllerrevision/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/apps/controllerrevision/storage", importpath = "k8s.io/kubernetes/pkg/registry/apps/controllerrevision/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/apps:go_default_library", "//pkg/apis/apps:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
......
pkg/registry/apps/controllerrevision/storage/storage_test.go
View file @ bebb9c91
...@@ -26,7 +26,6 @@ import ( ...@@ -26,7 +26,6 @@ import (
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/apps"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
...@@ -36,7 +35,7 @@ func TestCreate(t *testing.T) { ...@@ -36,7 +35,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
var ( var (
valid = stripObjectMeta(newControllerRevision("validname", metav1.NamespaceDefault, newObject(), 0)) valid = stripObjectMeta(newControllerRevision("validname", metav1.NamespaceDefault, newObject(), 0))
badRevision = stripObjectMeta(newControllerRevision("validname", "validns", newObject(), -1)) badRevision = stripObjectMeta(newControllerRevision("validname", "validns", newObject(), -1))
...@@ -60,7 +59,7 @@ func TestUpdate(t *testing.T) { ...@@ -60,7 +59,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
addLabel := func(obj runtime.Object) runtime.Object { addLabel := func(obj runtime.Object) runtime.Object {
rev := obj.(*apps.ControllerRevision) rev := obj.(*apps.ControllerRevision)
...@@ -95,7 +94,7 @@ func TestGet(t *testing.T) { ...@@ -95,7 +94,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestGet(newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0)) test.TestGet(newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0))
} }
...@@ -103,7 +102,7 @@ func TestList(t *testing.T) { ...@@ -103,7 +102,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestList(newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0)) test.TestList(newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0))
} }
...@@ -111,7 +110,7 @@ func TestDelete(t *testing.T) { ...@@ -111,7 +110,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestDelete(newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0)) test.TestDelete(newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0))
} }
...@@ -119,7 +118,7 @@ func TestWatch(t *testing.T) { ...@@ -119,7 +118,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestWatch( test.TestWatch(
newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0), newControllerRevision("valid", metav1.NamespaceDefault, newObject(), 0),
[]labels.Set{ []labels.Set{
......
pkg/registry/apps/statefulset/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/apps/statefulset/storage", importpath = "k8s.io/kubernetes/pkg/registry/apps/statefulset/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/apps:go_default_library", "//pkg/apis/apps:go_default_library",
"//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
......
pkg/registry/apps/statefulset/storage/storage_test.go
View file @ bebb9c91
...@@ -30,7 +30,6 @@ import ( ...@@ -30,7 +30,6 @@ import (
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/apps"
"k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
...@@ -95,7 +94,7 @@ func TestCreate(t *testing.T) { ...@@ -95,7 +94,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.StatefulSet.Store.DestroyFunc() defer storage.StatefulSet.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.StatefulSet.Store)
ps := validNewStatefulSet() ps := validNewStatefulSet()
ps.ObjectMeta = metav1.ObjectMeta{} ps.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -148,7 +147,7 @@ func TestGet(t *testing.T) { ...@@ -148,7 +147,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.StatefulSet.Store.DestroyFunc() defer storage.StatefulSet.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.StatefulSet.Store)
test.TestGet(validNewStatefulSet()) test.TestGet(validNewStatefulSet())
} }
...@@ -156,7 +155,7 @@ func TestList(t *testing.T) { ...@@ -156,7 +155,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.StatefulSet.Store.DestroyFunc() defer storage.StatefulSet.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.StatefulSet.Store)
test.TestList(validNewStatefulSet()) test.TestList(validNewStatefulSet())
} }
...@@ -164,7 +163,7 @@ func TestDelete(t *testing.T) { ...@@ -164,7 +163,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.StatefulSet.Store.DestroyFunc() defer storage.StatefulSet.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.StatefulSet.Store)
test.TestDelete(validNewStatefulSet()) test.TestDelete(validNewStatefulSet())
} }
...@@ -172,7 +171,7 @@ func TestWatch(t *testing.T) { ...@@ -172,7 +171,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.StatefulSet.Store.DestroyFunc() defer storage.StatefulSet.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.StatefulSet.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.StatefulSet.Store)
test.TestWatch( test.TestWatch(
validNewStatefulSet(), validNewStatefulSet(),
// matching labels // matching labels
......
pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/storage", importpath = "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
......
pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go
View file @ bebb9c91
...@@ -20,7 +20,6 @@ import ( ...@@ -20,7 +20,6 @@ import (
"testing" "testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
// Ensure that autoscaling/v1 package is initialized. // Ensure that autoscaling/v1 package is initialized.
...@@ -76,7 +75,7 @@ func TestCreate(t *testing.T) { ...@@ -76,7 +75,7 @@ func TestCreate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
autoscaler := validNewHorizontalPodAutoscaler("foo") autoscaler := validNewHorizontalPodAutoscaler("foo")
autoscaler.ObjectMeta = metav1.ObjectMeta{} autoscaler.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -91,7 +90,7 @@ func TestUpdate(t *testing.T) { ...@@ -91,7 +90,7 @@ func TestUpdate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewHorizontalPodAutoscaler("foo"), validNewHorizontalPodAutoscaler("foo"),
...@@ -108,7 +107,7 @@ func TestDelete(t *testing.T) { ...@@ -108,7 +107,7 @@ func TestDelete(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestDelete(validNewHorizontalPodAutoscaler("foo")) test.TestDelete(validNewHorizontalPodAutoscaler("foo"))
} }
...@@ -116,7 +115,7 @@ func TestGet(t *testing.T) { ...@@ -116,7 +115,7 @@ func TestGet(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestGet(validNewHorizontalPodAutoscaler("foo")) test.TestGet(validNewHorizontalPodAutoscaler("foo"))
} }
...@@ -124,7 +123,7 @@ func TestList(t *testing.T) { ...@@ -124,7 +123,7 @@ func TestList(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestList(validNewHorizontalPodAutoscaler("foo")) test.TestList(validNewHorizontalPodAutoscaler("foo"))
} }
...@@ -132,7 +131,7 @@ func TestWatch(t *testing.T) { ...@@ -132,7 +131,7 @@ func TestWatch(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestWatch( test.TestWatch(
validNewHorizontalPodAutoscaler("foo"), validNewHorizontalPodAutoscaler("foo"),
// matching labels // matching labels
......
pkg/registry/batch/cronjob/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/batch/cronjob/storage", importpath = "k8s.io/kubernetes/pkg/registry/batch/cronjob/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/api/testapi:go_default_library", "//pkg/api/testapi:go_default_library",
"//pkg/apis/batch:go_default_library", "//pkg/apis/batch:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
......
pkg/registry/batch/cronjob/storage/storage_test.go
View file @ bebb9c91
...@@ -27,7 +27,6 @@ import ( ...@@ -27,7 +27,6 @@ import (
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/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/api/testapi"
"k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/batch"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
...@@ -75,7 +74,7 @@ func TestCreate(t *testing.T) { ...@@ -75,7 +74,7 @@ func TestCreate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
validCronJob := validNewCronJob() validCronJob := validNewCronJob()
validCronJob.ObjectMeta = metav1.ObjectMeta{} validCronJob.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -97,7 +96,7 @@ func TestUpdate(t *testing.T) { ...@@ -97,7 +96,7 @@ func TestUpdate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
schedule := "1 1 1 1 ?" schedule := "1 1 1 1 ?"
test.TestUpdate( test.TestUpdate(
// valid // valid
...@@ -126,7 +125,7 @@ func TestDelete(t *testing.T) { ...@@ -126,7 +125,7 @@ func TestDelete(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestDelete(validNewCronJob()) test.TestDelete(validNewCronJob())
} }
...@@ -139,7 +138,7 @@ func TestGet(t *testing.T) { ...@@ -139,7 +138,7 @@ func TestGet(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestGet(validNewCronJob()) test.TestGet(validNewCronJob())
} }
...@@ -152,7 +151,7 @@ func TestList(t *testing.T) { ...@@ -152,7 +151,7 @@ func TestList(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestList(validNewCronJob()) test.TestList(validNewCronJob())
} }
...@@ -165,7 +164,7 @@ func TestWatch(t *testing.T) { ...@@ -165,7 +164,7 @@ func TestWatch(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestWatch( test.TestWatch(
validNewCronJob(), validNewCronJob(),
// matching labels // matching labels
......
pkg/registry/batch/job/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/batch/job/storage", importpath = "k8s.io/kubernetes/pkg/registry/batch/job/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/batch:go_default_library", "//pkg/apis/batch:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
......
pkg/registry/batch/job/storage/storage_test.go
View file @ bebb9c91
...@@ -26,7 +26,6 @@ import ( ...@@ -26,7 +26,6 @@ import (
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/batch"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
...@@ -84,7 +83,7 @@ func TestCreate(t *testing.T) { ...@@ -84,7 +83,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Job.Store.DestroyFunc() defer storage.Job.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Job.Store)
validJob := validNewJob() validJob := validNewJob()
validJob.ObjectMeta = metav1.ObjectMeta{} validJob.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -105,7 +104,7 @@ func TestUpdate(t *testing.T) { ...@@ -105,7 +104,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Job.Store.DestroyFunc() defer storage.Job.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Job.Store)
two := int32(2) two := int32(2)
test.TestUpdate( test.TestUpdate(
// valid // valid
...@@ -134,7 +133,7 @@ func TestDelete(t *testing.T) { ...@@ -134,7 +133,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Job.Store.DestroyFunc() defer storage.Job.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Job.Store)
test.TestDelete(validNewJob()) test.TestDelete(validNewJob())
} }
...@@ -142,7 +141,7 @@ func TestGet(t *testing.T) { ...@@ -142,7 +141,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Job.Store.DestroyFunc() defer storage.Job.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Job.Store)
test.TestGet(validNewJob()) test.TestGet(validNewJob())
} }
...@@ -150,7 +149,7 @@ func TestList(t *testing.T) { ...@@ -150,7 +149,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Job.Store.DestroyFunc() defer storage.Job.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Job.Store)
test.TestList(validNewJob()) test.TestList(validNewJob())
} }
...@@ -158,7 +157,7 @@ func TestWatch(t *testing.T) { ...@@ -158,7 +157,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Job.Store.DestroyFunc() defer storage.Job.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Job.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Job.Store)
test.TestWatch( test.TestWatch(
validNewJob(), validNewJob(),
// matching labels // matching labels
......
pkg/registry/core/configmap/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/configmap/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/configmap/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
......
pkg/registry/core/configmap/storage/storage_test.go
View file @ bebb9c91
...@@ -26,7 +26,6 @@ import ( ...@@ -26,7 +26,6 @@ import (
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -62,7 +61,7 @@ func TestCreate(t *testing.T) { ...@@ -62,7 +61,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
validConfigMap := validNewConfigMap() validConfigMap := validNewConfigMap()
validConfigMap.ObjectMeta = metav1.ObjectMeta{ validConfigMap.ObjectMeta = metav1.ObjectMeta{
...@@ -90,7 +89,7 @@ func TestUpdate(t *testing.T) { ...@@ -90,7 +89,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewConfigMap(), validNewConfigMap(),
...@@ -113,7 +112,7 @@ func TestDelete(t *testing.T) { ...@@ -113,7 +112,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestDelete(validNewConfigMap()) test.TestDelete(validNewConfigMap())
} }
...@@ -121,7 +120,7 @@ func TestGet(t *testing.T) { ...@@ -121,7 +120,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestGet(validNewConfigMap()) test.TestGet(validNewConfigMap())
} }
...@@ -129,7 +128,7 @@ func TestList(t *testing.T) { ...@@ -129,7 +128,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestList(validNewConfigMap()) test.TestList(validNewConfigMap())
} }
...@@ -137,7 +136,7 @@ func TestWatch(t *testing.T) { ...@@ -137,7 +136,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestWatch( test.TestWatch(
validNewConfigMap(), validNewConfigMap(),
// matching labels // matching labels
......
pkg/registry/core/endpoint/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/endpoint/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/endpoint/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
......
pkg/registry/core/endpoint/storage/storage_test.go
View file @ bebb9c91
...@@ -26,7 +26,6 @@ import ( ...@@ -26,7 +26,6 @@ import (
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -69,7 +68,7 @@ func TestCreate(t *testing.T) { ...@@ -69,7 +68,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
endpoints := validNewEndpoints() endpoints := validNewEndpoints()
endpoints.ObjectMeta = metav1.ObjectMeta{} endpoints.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -86,7 +85,7 @@ func TestUpdate(t *testing.T) { ...@@ -86,7 +85,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate() test := genericregistrytest.New(t, storage.Store).AllowCreateOnUpdate()
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewEndpoints(), validNewEndpoints(),
...@@ -106,7 +105,7 @@ func TestDelete(t *testing.T) { ...@@ -106,7 +105,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestDelete(validNewEndpoints()) test.TestDelete(validNewEndpoints())
} }
...@@ -114,7 +113,7 @@ func TestGet(t *testing.T) { ...@@ -114,7 +113,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestGet(validNewEndpoints()) test.TestGet(validNewEndpoints())
} }
...@@ -122,7 +121,7 @@ func TestList(t *testing.T) { ...@@ -122,7 +121,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestList(validNewEndpoints()) test.TestList(validNewEndpoints())
} }
...@@ -130,7 +129,7 @@ func TestWatch(t *testing.T) { ...@@ -130,7 +129,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestWatch( test.TestWatch(
validNewEndpoints(), validNewEndpoints(),
// matching labels // matching labels
......
pkg/registry/core/event/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/event/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/event/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
......
pkg/registry/core/event/storage/storage_test.go
View file @ bebb9c91
...@@ -24,7 +24,6 @@ import ( ...@@ -24,7 +24,6 @@ import (
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -60,7 +59,7 @@ func TestCreate(t *testing.T) { ...@@ -60,7 +59,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
event := validNewEvent(test.TestNamespace()) event := validNewEvent(test.TestNamespace())
event.ObjectMeta = metav1.ObjectMeta{} event.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -75,7 +74,7 @@ func TestUpdate(t *testing.T) { ...@@ -75,7 +74,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate() test := genericregistrytest.New(t, storage.Store).AllowCreateOnUpdate()
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewEvent(test.TestNamespace()), validNewEvent(test.TestNamespace()),
...@@ -98,7 +97,7 @@ func TestDelete(t *testing.T) { ...@@ -98,7 +97,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestDelete(validNewEvent(test.TestNamespace())) test.TestDelete(validNewEvent(test.TestNamespace()))
} }
......
pkg/registry/core/limitrange/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/limitrange/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/limitrange/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
......
pkg/registry/core/limitrange/storage/storage_test.go
View file @ bebb9c91
...@@ -27,7 +27,6 @@ import ( ...@@ -27,7 +27,6 @@ import (
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -71,7 +70,7 @@ func TestCreate(t *testing.T) { ...@@ -71,7 +70,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).GeneratesName() test := genericregistrytest.New(t, storage.Store).GeneratesName()
validLimitRange := validNewLimitRange() validLimitRange := validNewLimitRange()
validLimitRange.ObjectMeta = metav1.ObjectMeta{} validLimitRange.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -88,7 +87,7 @@ func TestUpdate(t *testing.T) { ...@@ -88,7 +87,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate() test := genericregistrytest.New(t, storage.Store).AllowCreateOnUpdate()
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewLimitRange(), validNewLimitRange(),
...@@ -117,7 +116,7 @@ func TestDelete(t *testing.T) { ...@@ -117,7 +116,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestDelete(validNewLimitRange()) test.TestDelete(validNewLimitRange())
} }
...@@ -125,7 +124,7 @@ func TestGet(t *testing.T) { ...@@ -125,7 +124,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestGet(validNewLimitRange()) test.TestGet(validNewLimitRange())
} }
...@@ -133,7 +132,7 @@ func TestList(t *testing.T) { ...@@ -133,7 +132,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestList(validNewLimitRange()) test.TestList(validNewLimitRange())
} }
...@@ -141,7 +140,7 @@ func TestWatch(t *testing.T) { ...@@ -141,7 +140,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestWatch( test.TestWatch(
validNewLimitRange(), validNewLimitRange(),
// matching labels // matching labels
......
pkg/registry/core/namespace/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/namespace/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/namespace/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
......
pkg/registry/core/namespace/storage/storage_test.go
View file @ bebb9c91
...@@ -27,7 +27,6 @@ import ( ...@@ -27,7 +27,6 @@ import (
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -51,7 +50,7 @@ func TestCreate(t *testing.T) { ...@@ -51,7 +50,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.store.DestroyFunc() defer storage.store.DestroyFunc()
test := genericregistrytest.New(t, storage.store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.store).ClusterScope()
namespace := validNewNamespace() namespace := validNewNamespace()
namespace.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"} namespace.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"}
test.TestCreate( test.TestCreate(
...@@ -95,7 +94,7 @@ func TestDelete(t *testing.T) { ...@@ -95,7 +94,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.store.DestroyFunc() 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()) test.TestDelete(validNewNamespace())
} }
...@@ -103,7 +102,7 @@ func TestGet(t *testing.T) { ...@@ -103,7 +102,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.store.DestroyFunc() defer storage.store.DestroyFunc()
test := genericregistrytest.New(t, storage.store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.store).ClusterScope()
test.TestGet(validNewNamespace()) test.TestGet(validNewNamespace())
} }
...@@ -111,7 +110,7 @@ func TestList(t *testing.T) { ...@@ -111,7 +110,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.store.DestroyFunc() defer storage.store.DestroyFunc()
test := genericregistrytest.New(t, storage.store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.store).ClusterScope()
test.TestList(validNewNamespace()) test.TestList(validNewNamespace())
} }
...@@ -119,7 +118,7 @@ func TestWatch(t *testing.T) { ...@@ -119,7 +118,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.store.DestroyFunc() defer storage.store.DestroyFunc()
test := genericregistrytest.New(t, storage.store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.store).ClusterScope()
test.TestWatch( test.TestWatch(
validNewNamespace(), validNewNamespace(),
// matching labels // matching labels
......
pkg/registry/core/node/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/node/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/node/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/kubelet/client:go_default_library", "//pkg/kubelet/client:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
......
pkg/registry/core/node/storage/storage_test.go
View file @ bebb9c91
...@@ -27,7 +27,6 @@ import ( ...@@ -27,7 +27,6 @@ import (
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
...@@ -72,7 +71,7 @@ func TestCreate(t *testing.T) { ...@@ -72,7 +71,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
node := validNewNode() node := validNewNode()
node.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"} node.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"}
test.TestCreate( test.TestCreate(
...@@ -89,7 +88,7 @@ func TestUpdate(t *testing.T) { ...@@ -89,7 +88,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewNode(), validNewNode(),
...@@ -106,7 +105,7 @@ func TestDelete(t *testing.T) { ...@@ -106,7 +105,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestDelete(validNewNode()) test.TestDelete(validNewNode())
} }
...@@ -114,7 +113,7 @@ func TestGet(t *testing.T) { ...@@ -114,7 +113,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestGet(validNewNode()) test.TestGet(validNewNode())
} }
...@@ -122,7 +121,7 @@ func TestList(t *testing.T) { ...@@ -122,7 +121,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestList(validNewNode()) test.TestList(validNewNode())
} }
...@@ -130,7 +129,7 @@ func TestWatch(t *testing.T) { ...@@ -130,7 +129,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestWatch( test.TestWatch(
validNewNode(), validNewNode(),
// matching labels // matching labels
......
pkg/registry/core/persistentvolume/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/persistentvolume/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/persistentvolume/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
......
pkg/registry/core/persistentvolume/storage/storage_test.go
View file @ bebb9c91
...@@ -31,7 +31,6 @@ import ( ...@@ -31,7 +31,6 @@ import (
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -87,7 +86,7 @@ func TestCreate(t *testing.T) { ...@@ -87,7 +86,7 @@ func TestCreate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
pv := validNewPersistentVolume("foo") pv := validNewPersistentVolume("foo")
pv.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"} pv.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"}
test.TestCreate( test.TestCreate(
...@@ -104,7 +103,7 @@ func TestUpdate(t *testing.T) { ...@@ -104,7 +103,7 @@ func TestUpdate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewPersistentVolume("foo"), validNewPersistentVolume("foo"),
...@@ -123,7 +122,7 @@ func TestDelete(t *testing.T) { ...@@ -123,7 +122,7 @@ func TestDelete(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope().ReturnDeletedObject() test := genericregistrytest.New(t, storage.Store).ClusterScope().ReturnDeletedObject()
test.TestDelete(validNewPersistentVolume("foo")) test.TestDelete(validNewPersistentVolume("foo"))
} }
...@@ -131,7 +130,7 @@ func TestGet(t *testing.T) { ...@@ -131,7 +130,7 @@ func TestGet(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestGet(validNewPersistentVolume("foo")) test.TestGet(validNewPersistentVolume("foo"))
} }
...@@ -139,7 +138,7 @@ func TestList(t *testing.T) { ...@@ -139,7 +138,7 @@ func TestList(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestList(validNewPersistentVolume("foo")) test.TestList(validNewPersistentVolume("foo"))
} }
...@@ -147,7 +146,7 @@ func TestWatch(t *testing.T) { ...@@ -147,7 +146,7 @@ func TestWatch(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestWatch( test.TestWatch(
validNewPersistentVolume("foo"), validNewPersistentVolume("foo"),
// matching labels // matching labels
......
pkg/registry/core/persistentvolumeclaim/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/persistentvolumeclaim/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/persistentvolumeclaim/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
......
pkg/registry/core/persistentvolumeclaim/storage/storage_test.go
View file @ bebb9c91
...@@ -31,7 +31,6 @@ import ( ...@@ -31,7 +31,6 @@ import (
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -73,7 +72,7 @@ func TestCreate(t *testing.T) { ...@@ -73,7 +72,7 @@ func TestCreate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
pv := validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault) pv := validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault)
pv.ObjectMeta = metav1.ObjectMeta{} pv.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -90,7 +89,7 @@ func TestUpdate(t *testing.T) { ...@@ -90,7 +89,7 @@ func TestUpdate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault), validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault),
...@@ -107,7 +106,7 @@ func TestDelete(t *testing.T) { ...@@ -107,7 +106,7 @@ func TestDelete(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ReturnDeletedObject() test := genericregistrytest.New(t, storage.Store).ReturnDeletedObject()
test.TestDelete(validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault)) test.TestDelete(validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault))
} }
...@@ -115,7 +114,7 @@ func TestGet(t *testing.T) { ...@@ -115,7 +114,7 @@ func TestGet(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestGet(validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault)) test.TestGet(validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault))
} }
...@@ -123,7 +122,7 @@ func TestList(t *testing.T) { ...@@ -123,7 +122,7 @@ func TestList(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestList(validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault)) test.TestList(validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault))
} }
...@@ -131,7 +130,7 @@ func TestWatch(t *testing.T) { ...@@ -131,7 +130,7 @@ func TestWatch(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestWatch( test.TestWatch(
validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault), validNewPersistentVolumeClaim("foo", metav1.NamespaceDefault),
// matching labels // matching labels
......
pkg/registry/core/pod/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/pod/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/pod/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//pkg/securitycontext:go_default_library", "//pkg/securitycontext:go_default_library",
......
pkg/registry/core/pod/storage/storage_test.go
View file @ bebb9c91
...@@ -41,7 +41,6 @@ import ( ...@@ -41,7 +41,6 @@ import (
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature"
utilfeaturetesting "k8s.io/apiserver/pkg/util/feature/testing" utilfeaturetesting "k8s.io/apiserver/pkg/util/feature/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
"k8s.io/kubernetes/pkg/securitycontext" "k8s.io/kubernetes/pkg/securitycontext"
...@@ -100,7 +99,7 @@ func TestCreate(t *testing.T) { ...@@ -100,7 +99,7 @@ func TestCreate(t *testing.T) {
storage, _, _, server := newStorage(t) storage, _, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
pod := validNewPod() pod := validNewPod()
pod.ObjectMeta = metav1.ObjectMeta{} pod.ObjectMeta = metav1.ObjectMeta{}
// Make an invalid pod with an an incorrect label. // Make an invalid pod with an an incorrect label.
...@@ -127,7 +126,7 @@ func TestUpdate(t *testing.T) { ...@@ -127,7 +126,7 @@ func TestUpdate(t *testing.T) {
storage, _, _, server := newStorage(t) storage, _, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewPod(), validNewPod(),
...@@ -144,7 +143,7 @@ func TestDelete(t *testing.T) { ...@@ -144,7 +143,7 @@ func TestDelete(t *testing.T) {
storage, _, _, server := newStorage(t) storage, _, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ReturnDeletedObject() test := genericregistrytest.New(t, storage.Store).ReturnDeletedObject()
test.TestDelete(validNewPod()) test.TestDelete(validNewPod())
scheduledPod := validNewPod() scheduledPod := validNewPod()
...@@ -368,7 +367,7 @@ func TestGet(t *testing.T) { ...@@ -368,7 +367,7 @@ func TestGet(t *testing.T) {
storage, _, _, server := newStorage(t) storage, _, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestGet(validNewPod()) test.TestGet(validNewPod())
} }
...@@ -376,7 +375,7 @@ func TestList(t *testing.T) { ...@@ -376,7 +375,7 @@ func TestList(t *testing.T) {
storage, _, _, server := newStorage(t) storage, _, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestList(validNewPod()) test.TestList(validNewPod())
} }
...@@ -384,7 +383,7 @@ func TestWatch(t *testing.T) { ...@@ -384,7 +383,7 @@ func TestWatch(t *testing.T) {
storage, _, _, server := newStorage(t) storage, _, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestWatch( test.TestWatch(
validNewPod(), validNewPod(),
// matching labels // matching labels
......
pkg/registry/core/podtemplate/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/podtemplate/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/podtemplate/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
......
pkg/registry/core/podtemplate/storage/storage_test.go
View file @ bebb9c91
...@@ -26,7 +26,6 @@ import ( ...@@ -26,7 +26,6 @@ import (
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -74,7 +73,7 @@ func TestCreate(t *testing.T) { ...@@ -74,7 +73,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
pod := validNewPodTemplate("foo") pod := validNewPodTemplate("foo")
pod.ObjectMeta = metav1.ObjectMeta{} pod.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -91,7 +90,7 @@ func TestUpdate(t *testing.T) { ...@@ -91,7 +90,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestUpdate( test.TestUpdate(
//valid //valid
validNewPodTemplate("foo"), validNewPodTemplate("foo"),
...@@ -108,7 +107,7 @@ func TestDelete(t *testing.T) { ...@@ -108,7 +107,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ReturnDeletedObject() test := genericregistrytest.New(t, storage.Store).ReturnDeletedObject()
test.TestDelete(validNewPodTemplate("foo")) test.TestDelete(validNewPodTemplate("foo"))
} }
...@@ -116,7 +115,7 @@ func TestGet(t *testing.T) { ...@@ -116,7 +115,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestGet(validNewPodTemplate("foo")) test.TestGet(validNewPodTemplate("foo"))
} }
...@@ -124,7 +123,7 @@ func TestList(t *testing.T) { ...@@ -124,7 +123,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestList(validNewPodTemplate("foo")) test.TestList(validNewPodTemplate("foo"))
} }
...@@ -132,7 +131,7 @@ func TestWatch(t *testing.T) { ...@@ -132,7 +131,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestWatch( test.TestWatch(
validNewPodTemplate("foo"), validNewPodTemplate("foo"),
// matching labels // matching labels
......
pkg/registry/core/replicationcontroller/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/replicationcontroller/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/replicationcontroller/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
......
pkg/registry/core/replicationcontroller/storage/storage_test.go
View file @ bebb9c91
...@@ -31,7 +31,6 @@ import ( ...@@ -31,7 +31,6 @@ import (
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
...@@ -100,7 +99,7 @@ func TestCreate(t *testing.T) { ...@@ -100,7 +99,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Controller.Store.DestroyFunc() defer storage.Controller.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Controller.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Controller.Store)
controller := validNewController() controller := validNewController()
controller.ObjectMeta = metav1.ObjectMeta{} controller.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -121,7 +120,7 @@ func TestUpdate(t *testing.T) { ...@@ -121,7 +120,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Controller.Store.DestroyFunc() defer storage.Controller.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Controller.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Controller.Store)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewController(), validNewController(),
...@@ -149,7 +148,7 @@ func TestDelete(t *testing.T) { ...@@ -149,7 +148,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Controller.Store.DestroyFunc() defer storage.Controller.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Controller.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Controller.Store)
test.TestDelete(validNewController()) test.TestDelete(validNewController())
} }
...@@ -208,7 +207,7 @@ func TestGet(t *testing.T) { ...@@ -208,7 +207,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Controller.Store.DestroyFunc() defer storage.Controller.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Controller.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Controller.Store)
test.TestGet(validNewController()) test.TestGet(validNewController())
} }
...@@ -216,7 +215,7 @@ func TestList(t *testing.T) { ...@@ -216,7 +215,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Controller.Store.DestroyFunc() defer storage.Controller.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Controller.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Controller.Store)
test.TestList(validNewController()) test.TestList(validNewController())
} }
...@@ -224,7 +223,7 @@ func TestWatch(t *testing.T) { ...@@ -224,7 +223,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Controller.Store.DestroyFunc() defer storage.Controller.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Controller.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Controller.Store)
test.TestWatch( test.TestWatch(
validController, validController,
// matching labels // matching labels
......
pkg/registry/core/resourcequota/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/resourcequota/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/resourcequota/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
......
pkg/registry/core/resourcequota/storage/storage_test.go
View file @ bebb9c91
...@@ -30,7 +30,6 @@ import ( ...@@ -30,7 +30,6 @@ import (
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -70,7 +69,7 @@ func TestCreate(t *testing.T) { ...@@ -70,7 +69,7 @@ func TestCreate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
resourcequota := validNewResourceQuota() resourcequota := validNewResourceQuota()
resourcequota.ObjectMeta = metav1.ObjectMeta{} resourcequota.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -111,7 +110,7 @@ func TestDelete(t *testing.T) { ...@@ -111,7 +110,7 @@ func TestDelete(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ReturnDeletedObject() test := genericregistrytest.New(t, storage.Store).ReturnDeletedObject()
test.TestDelete(validNewResourceQuota()) test.TestDelete(validNewResourceQuota())
} }
...@@ -119,7 +118,7 @@ func TestGet(t *testing.T) { ...@@ -119,7 +118,7 @@ func TestGet(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestGet(validNewResourceQuota()) test.TestGet(validNewResourceQuota())
} }
...@@ -127,7 +126,7 @@ func TestList(t *testing.T) { ...@@ -127,7 +126,7 @@ func TestList(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestList(validNewResourceQuota()) test.TestList(validNewResourceQuota())
} }
...@@ -135,7 +134,7 @@ func TestWatch(t *testing.T) { ...@@ -135,7 +134,7 @@ func TestWatch(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestWatch( test.TestWatch(
validNewResourceQuota(), validNewResourceQuota(),
// matching labels // matching labels
......
pkg/registry/core/secret/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/secret/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/secret/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
......
pkg/registry/core/secret/storage/storage_test.go
View file @ bebb9c91
...@@ -26,7 +26,6 @@ import ( ...@@ -26,7 +26,6 @@ import (
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -58,7 +57,7 @@ func TestCreate(t *testing.T) { ...@@ -58,7 +57,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
secret := validNewSecret("foo") secret := validNewSecret("foo")
secret.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo-"} secret.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo-"}
test.TestCreate( test.TestCreate(
...@@ -81,7 +80,7 @@ func TestUpdate(t *testing.T) { ...@@ -81,7 +80,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewSecret("foo"), validNewSecret("foo"),
...@@ -98,7 +97,7 @@ func TestDelete(t *testing.T) { ...@@ -98,7 +97,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestDelete(validNewSecret("foo")) test.TestDelete(validNewSecret("foo"))
} }
...@@ -106,7 +105,7 @@ func TestGet(t *testing.T) { ...@@ -106,7 +105,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestGet(validNewSecret("foo")) test.TestGet(validNewSecret("foo"))
} }
...@@ -114,7 +113,7 @@ func TestList(t *testing.T) { ...@@ -114,7 +113,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestList(validNewSecret("foo")) test.TestList(validNewSecret("foo"))
} }
...@@ -122,7 +121,7 @@ func TestWatch(t *testing.T) { ...@@ -122,7 +121,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestWatch( test.TestWatch(
validNewSecret("foo"), validNewSecret("foo"),
// matching labels // matching labels
......
pkg/registry/core/service/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/service/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/service/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
......
pkg/registry/core/service/storage/storage_test.go
View file @ bebb9c91
...@@ -27,7 +27,6 @@ import ( ...@@ -27,7 +27,6 @@ import (
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -68,7 +67,7 @@ func TestCreate(t *testing.T) { ...@@ -68,7 +67,7 @@ func TestCreate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
validService := validService() validService := validService()
validService.ObjectMeta = metav1.ObjectMeta{} validService.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -99,7 +98,7 @@ func TestUpdate(t *testing.T) { ...@@ -99,7 +98,7 @@ func TestUpdate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate() test := genericregistrytest.New(t, storage.Store).AllowCreateOnUpdate()
test.TestUpdate( test.TestUpdate(
// valid // valid
validService(), validService(),
...@@ -126,7 +125,7 @@ func TestDelete(t *testing.T) { ...@@ -126,7 +125,7 @@ func TestDelete(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate() test := genericregistrytest.New(t, storage.Store).AllowCreateOnUpdate()
test.TestDelete(validService()) test.TestDelete(validService())
} }
...@@ -134,7 +133,7 @@ func TestGet(t *testing.T) { ...@@ -134,7 +133,7 @@ func TestGet(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate() test := genericregistrytest.New(t, storage.Store).AllowCreateOnUpdate()
test.TestGet(validService()) test.TestGet(validService())
} }
...@@ -142,7 +141,7 @@ func TestList(t *testing.T) { ...@@ -142,7 +141,7 @@ func TestList(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).AllowCreateOnUpdate() test := genericregistrytest.New(t, storage.Store).AllowCreateOnUpdate()
test.TestList(validService()) test.TestList(validService())
} }
...@@ -150,7 +149,7 @@ func TestWatch(t *testing.T) { ...@@ -150,7 +149,7 @@ func TestWatch(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestWatch( test.TestWatch(
validService(), validService(),
// matching labels // matching labels
......
pkg/registry/core/serviceaccount/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/core/serviceaccount/storage", importpath = "k8s.io/kubernetes/pkg/registry/core/serviceaccount/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
......
pkg/registry/core/serviceaccount/storage/storage_test.go
View file @ bebb9c91
...@@ -26,7 +26,6 @@ import ( ...@@ -26,7 +26,6 @@ import (
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -56,7 +55,7 @@ func TestCreate(t *testing.T) { ...@@ -56,7 +55,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
serviceAccount := validNewServiceAccount("foo") serviceAccount := validNewServiceAccount("foo")
serviceAccount.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo-"} serviceAccount.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo-"}
test.TestCreate( test.TestCreate(
...@@ -74,7 +73,7 @@ func TestUpdate(t *testing.T) { ...@@ -74,7 +73,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewServiceAccount("foo"), validNewServiceAccount("foo"),
...@@ -91,7 +90,7 @@ func TestDelete(t *testing.T) { ...@@ -91,7 +90,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ReturnDeletedObject() test := genericregistrytest.New(t, storage.Store).ReturnDeletedObject()
test.TestDelete(validNewServiceAccount("foo")) test.TestDelete(validNewServiceAccount("foo"))
} }
...@@ -99,7 +98,7 @@ func TestGet(t *testing.T) { ...@@ -99,7 +98,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestGet(validNewServiceAccount("foo")) test.TestGet(validNewServiceAccount("foo"))
} }
...@@ -107,7 +106,7 @@ func TestList(t *testing.T) { ...@@ -107,7 +106,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestList(validNewServiceAccount("foo")) test.TestList(validNewServiceAccount("foo"))
} }
...@@ -115,7 +114,7 @@ func TestWatch(t *testing.T) { ...@@ -115,7 +114,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestWatch( test.TestWatch(
validNewServiceAccount("foo"), validNewServiceAccount("foo"),
// matching labels // matching labels
......
pkg/registry/extensions/daemonset/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage", importpath = "k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
......
pkg/registry/extensions/daemonset/storage/storage_test.go
View file @ bebb9c91
...@@ -26,7 +26,6 @@ import ( ...@@ -26,7 +26,6 @@ import (
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
...@@ -82,7 +81,7 @@ func TestCreate(t *testing.T) { ...@@ -82,7 +81,7 @@ func TestCreate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
ds := newValidDaemonSet() ds := newValidDaemonSet()
ds.ObjectMeta = metav1.ObjectMeta{} ds.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -109,7 +108,7 @@ func TestUpdate(t *testing.T) { ...@@ -109,7 +108,7 @@ func TestUpdate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestUpdate( test.TestUpdate(
// valid // valid
newValidDaemonSet(), newValidDaemonSet(),
...@@ -138,7 +137,7 @@ func TestDelete(t *testing.T) { ...@@ -138,7 +137,7 @@ func TestDelete(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestDelete(newValidDaemonSet()) test.TestDelete(newValidDaemonSet())
} }
...@@ -146,7 +145,7 @@ func TestGet(t *testing.T) { ...@@ -146,7 +145,7 @@ func TestGet(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestGet(newValidDaemonSet()) test.TestGet(newValidDaemonSet())
} }
...@@ -154,7 +153,7 @@ func TestList(t *testing.T) { ...@@ -154,7 +153,7 @@ func TestList(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestList(newValidDaemonSet()) test.TestList(newValidDaemonSet())
} }
...@@ -162,7 +161,7 @@ func TestWatch(t *testing.T) { ...@@ -162,7 +161,7 @@ func TestWatch(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestWatch( test.TestWatch(
validDaemonSet, validDaemonSet,
// matching labels // matching labels
......
pkg/registry/extensions/deployment/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage", importpath = "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions:go_default_library",
......
pkg/registry/extensions/deployment/storage/storage_test.go
View file @ bebb9c91
...@@ -35,7 +35,6 @@ import ( ...@@ -35,7 +35,6 @@ import (
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
storeerr "k8s.io/apiserver/pkg/storage/errors" storeerr "k8s.io/apiserver/pkg/storage/errors"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
...@@ -100,7 +99,7 @@ func TestCreate(t *testing.T) { ...@@ -100,7 +99,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Deployment.Store.DestroyFunc() defer storage.Deployment.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Deployment.Store)
deployment := validNewDeployment() deployment := validNewDeployment()
deployment.ObjectMeta = metav1.ObjectMeta{} deployment.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -120,7 +119,7 @@ func TestUpdate(t *testing.T) { ...@@ -120,7 +119,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Deployment.Store.DestroyFunc() defer storage.Deployment.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Deployment.Store)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewDeployment(), validNewDeployment(),
...@@ -153,7 +152,7 @@ func TestDelete(t *testing.T) { ...@@ -153,7 +152,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Deployment.Store.DestroyFunc() defer storage.Deployment.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Deployment.Store)
test.TestDelete(validNewDeployment()) test.TestDelete(validNewDeployment())
} }
...@@ -161,7 +160,7 @@ func TestGet(t *testing.T) { ...@@ -161,7 +160,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Deployment.Store.DestroyFunc() defer storage.Deployment.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Deployment.Store)
test.TestGet(validNewDeployment()) test.TestGet(validNewDeployment())
} }
...@@ -169,7 +168,7 @@ func TestList(t *testing.T) { ...@@ -169,7 +168,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Deployment.Store.DestroyFunc() defer storage.Deployment.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Deployment.Store)
test.TestList(validNewDeployment()) test.TestList(validNewDeployment())
} }
...@@ -177,7 +176,7 @@ func TestWatch(t *testing.T) { ...@@ -177,7 +176,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Deployment.Store.DestroyFunc() defer storage.Deployment.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Deployment.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Deployment.Store)
test.TestWatch( test.TestWatch(
validNewDeployment(), validNewDeployment(),
// matching labels // matching labels
......
pkg/registry/extensions/ingress/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/extensions/ingress/storage", importpath = "k8s.io/kubernetes/pkg/registry/extensions/ingress/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
......
pkg/registry/extensions/ingress/storage/storage_test.go
View file @ bebb9c91
...@@ -27,7 +27,6 @@ import ( ...@@ -27,7 +27,6 @@ import (
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
...@@ -124,7 +123,7 @@ func TestCreate(t *testing.T) { ...@@ -124,7 +123,7 @@ func TestCreate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
ingress := validIngress() ingress := validIngress()
noDefaultBackendAndRules := validIngress() noDefaultBackendAndRules := validIngress()
noDefaultBackendAndRules.Spec.Backend = &extensions.IngressBackend{} noDefaultBackendAndRules.Spec.Backend = &extensions.IngressBackend{}
...@@ -144,7 +143,7 @@ func TestUpdate(t *testing.T) { ...@@ -144,7 +143,7 @@ func TestUpdate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestUpdate( test.TestUpdate(
// valid // valid
validIngress(), validIngress(),
...@@ -180,7 +179,7 @@ func TestDelete(t *testing.T) { ...@@ -180,7 +179,7 @@ func TestDelete(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestDelete(validIngress()) test.TestDelete(validIngress())
} }
...@@ -188,7 +187,7 @@ func TestGet(t *testing.T) { ...@@ -188,7 +187,7 @@ func TestGet(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestGet(validIngress()) test.TestGet(validIngress())
} }
...@@ -196,7 +195,7 @@ func TestList(t *testing.T) { ...@@ -196,7 +195,7 @@ func TestList(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestList(validIngress()) test.TestList(validIngress())
} }
...@@ -204,7 +203,7 @@ func TestWatch(t *testing.T) { ...@@ -204,7 +203,7 @@ func TestWatch(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestWatch( test.TestWatch(
validIngress(), validIngress(),
// matching labels // matching labels
......
pkg/registry/extensions/podsecuritypolicy/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy/storage", importpath = "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library", "//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
......
pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go
View file @ bebb9c91
...@@ -20,7 +20,6 @@ import ( ...@@ -20,7 +20,6 @@ import (
"testing" "testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
// Ensure that extensions/v1beta1 package is initialized. // Ensure that extensions/v1beta1 package is initialized.
_ "k8s.io/api/extensions/v1beta1" _ "k8s.io/api/extensions/v1beta1"
...@@ -70,7 +69,7 @@ func TestCreate(t *testing.T) { ...@@ -70,7 +69,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
psp := validNewPodSecurityPolicy() psp := validNewPodSecurityPolicy()
psp.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo-"} psp.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo-"}
test.TestCreate( test.TestCreate(
...@@ -87,7 +86,7 @@ func TestUpdate(t *testing.T) { ...@@ -87,7 +86,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewPodSecurityPolicy(), validNewPodSecurityPolicy(),
...@@ -104,7 +103,7 @@ func TestDelete(t *testing.T) { ...@@ -104,7 +103,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope().ReturnDeletedObject() test := genericregistrytest.New(t, storage.Store).ClusterScope().ReturnDeletedObject()
test.TestDelete(validNewPodSecurityPolicy()) test.TestDelete(validNewPodSecurityPolicy())
} }
...@@ -112,7 +111,7 @@ func TestGet(t *testing.T) { ...@@ -112,7 +111,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestGet(validNewPodSecurityPolicy()) test.TestGet(validNewPodSecurityPolicy())
} }
...@@ -120,7 +119,7 @@ func TestList(t *testing.T) { ...@@ -120,7 +119,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestList(validNewPodSecurityPolicy()) test.TestList(validNewPodSecurityPolicy())
} }
...@@ -128,7 +127,7 @@ func TestWatch(t *testing.T) { ...@@ -128,7 +127,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestWatch( test.TestWatch(
validNewPodSecurityPolicy(), validNewPodSecurityPolicy(),
// matching labels // matching labels
......
pkg/registry/extensions/replicaset/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/extensions/replicaset/storage", importpath = "k8s.io/kubernetes/pkg/registry/extensions/replicaset/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions:go_default_library",
......
pkg/registry/extensions/replicaset/storage/storage_test.go
View file @ bebb9c91
...@@ -31,7 +31,6 @@ import ( ...@@ -31,7 +31,6 @@ import (
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
...@@ -97,7 +96,7 @@ func TestCreate(t *testing.T) { ...@@ -97,7 +96,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.ReplicaSet.Store.DestroyFunc() defer storage.ReplicaSet.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.ReplicaSet.Store)
rs := validNewReplicaSet() rs := validNewReplicaSet()
rs.ObjectMeta = metav1.ObjectMeta{} rs.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -118,7 +117,7 @@ func TestUpdate(t *testing.T) { ...@@ -118,7 +117,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.ReplicaSet.Store.DestroyFunc() defer storage.ReplicaSet.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.ReplicaSet.Store)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewReplicaSet(), validNewReplicaSet(),
...@@ -146,7 +145,7 @@ func TestDelete(t *testing.T) { ...@@ -146,7 +145,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.ReplicaSet.Store.DestroyFunc() defer storage.ReplicaSet.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.ReplicaSet.Store)
test.TestDelete(validNewReplicaSet()) test.TestDelete(validNewReplicaSet())
} }
...@@ -205,7 +204,7 @@ func TestGet(t *testing.T) { ...@@ -205,7 +204,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.ReplicaSet.Store.DestroyFunc() defer storage.ReplicaSet.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.ReplicaSet.Store)
test.TestGet(validNewReplicaSet()) test.TestGet(validNewReplicaSet())
} }
...@@ -213,7 +212,7 @@ func TestList(t *testing.T) { ...@@ -213,7 +212,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.ReplicaSet.Store.DestroyFunc() defer storage.ReplicaSet.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.ReplicaSet.Store)
test.TestList(validNewReplicaSet()) test.TestList(validNewReplicaSet())
} }
...@@ -221,7 +220,7 @@ func TestWatch(t *testing.T) { ...@@ -221,7 +220,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.ReplicaSet.Store.DestroyFunc() defer storage.ReplicaSet.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.ReplicaSet.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.ReplicaSet.Store)
test.TestWatch( test.TestWatch(
validNewReplicaSet(), validNewReplicaSet(),
// matching labels // matching labels
......
pkg/registry/networking/networkpolicy/storage/BUILD
View file @ bebb9c91
...@@ -39,7 +39,6 @@ go_test( ...@@ -39,7 +39,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/networking/networkpolicy/storage", importpath = "k8s.io/kubernetes/pkg/registry/networking/networkpolicy/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/apis/networking:go_default_library", "//pkg/apis/networking:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
......
pkg/registry/networking/networkpolicy/storage/storage_test.go
View file @ bebb9c91
...@@ -27,7 +27,6 @@ import ( ...@@ -27,7 +27,6 @@ import (
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/networking" "k8s.io/kubernetes/pkg/apis/networking"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
...@@ -73,7 +72,7 @@ func TestCreate(t *testing.T) { ...@@ -73,7 +72,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
np := validNetworkPolicy() np := validNetworkPolicy()
np.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo-"} np.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo-"}
test.TestCreate( test.TestCreate(
...@@ -91,7 +90,7 @@ func TestUpdate(t *testing.T) { ...@@ -91,7 +90,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNetworkPolicy(), validNetworkPolicy(),
...@@ -134,7 +133,7 @@ func TestDelete(t *testing.T) { ...@@ -134,7 +133,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestDelete(validNetworkPolicy()) test.TestDelete(validNetworkPolicy())
} }
...@@ -142,7 +141,7 @@ func TestGet(t *testing.T) { ...@@ -142,7 +141,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestGet(validNetworkPolicy()) test.TestGet(validNetworkPolicy())
} }
...@@ -150,7 +149,7 @@ func TestList(t *testing.T) { ...@@ -150,7 +149,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestList(validNetworkPolicy()) test.TestList(validNetworkPolicy())
} }
...@@ -158,7 +157,7 @@ func TestWatch(t *testing.T) { ...@@ -158,7 +157,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestWatch( test.TestWatch(
validNetworkPolicy(), validNetworkPolicy(),
// matching labels // matching labels
......
pkg/registry/policy/poddisruptionbudget/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget/storage", importpath = "k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/policy:go_default_library", "//pkg/apis/policy:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
......
pkg/registry/policy/poddisruptionbudget/storage/storage_test.go
View file @ bebb9c91
...@@ -28,7 +28,6 @@ import ( ...@@ -28,7 +28,6 @@ import (
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/apis/policy"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -71,7 +70,7 @@ func TestCreate(t *testing.T) { ...@@ -71,7 +70,7 @@ func TestCreate(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
pdb := validNewPodDisruptionBudget() pdb := validNewPodDisruptionBudget()
pdb.ObjectMeta = metav1.ObjectMeta{} pdb.ObjectMeta = metav1.ObjectMeta{}
test.TestCreate( test.TestCreate(
...@@ -132,7 +131,7 @@ func TestGet(t *testing.T) { ...@@ -132,7 +131,7 @@ func TestGet(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestGet(validNewPodDisruptionBudget()) test.TestGet(validNewPodDisruptionBudget())
} }
...@@ -140,7 +139,7 @@ func TestList(t *testing.T) { ...@@ -140,7 +139,7 @@ func TestList(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestList(validNewPodDisruptionBudget()) test.TestList(validNewPodDisruptionBudget())
} }
...@@ -148,7 +147,7 @@ func TestDelete(t *testing.T) { ...@@ -148,7 +147,7 @@ func TestDelete(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestDelete(validNewPodDisruptionBudget()) test.TestDelete(validNewPodDisruptionBudget())
} }
...@@ -156,7 +155,7 @@ func TestWatch(t *testing.T) { ...@@ -156,7 +155,7 @@ func TestWatch(t *testing.T) {
storage, _, server := newStorage(t) storage, _, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestWatch( test.TestWatch(
validNewPodDisruptionBudget(), validNewPodDisruptionBudget(),
// matching labels // matching labels
......
pkg/registry/scheduling/priorityclass/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/scheduling/priorityclass/storage", importpath = "k8s.io/kubernetes/pkg/registry/scheduling/priorityclass/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/scheduling:go_default_library", "//pkg/apis/scheduling:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
......
pkg/registry/scheduling/priorityclass/storage/storage_test.go
View file @ bebb9c91
...@@ -26,7 +26,6 @@ import ( ...@@ -26,7 +26,6 @@ import (
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/scheduling" "k8s.io/kubernetes/pkg/apis/scheduling"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
) )
...@@ -57,7 +56,7 @@ func TestCreate(t *testing.T) { ...@@ -57,7 +56,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestCreate( test.TestCreate(
validNewPriorityClass(), validNewPriorityClass(),
// invalid cases // invalid cases
...@@ -76,7 +75,7 @@ func TestUpdate(t *testing.T) { ...@@ -76,7 +75,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewPriorityClass(), validNewPriorityClass(),
...@@ -102,7 +101,7 @@ func TestDelete(t *testing.T) { ...@@ -102,7 +101,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestDelete(validNewPriorityClass()) test.TestDelete(validNewPriorityClass())
} }
...@@ -110,7 +109,7 @@ func TestGet(t *testing.T) { ...@@ -110,7 +109,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestGet(validNewPriorityClass()) test.TestGet(validNewPriorityClass())
} }
...@@ -118,7 +117,7 @@ func TestList(t *testing.T) { ...@@ -118,7 +117,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestList(validNewPriorityClass()) test.TestList(validNewPriorityClass())
} }
...@@ -126,7 +125,7 @@ func TestWatch(t *testing.T) { ...@@ -126,7 +125,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestWatch( test.TestWatch(
validNewPriorityClass(), validNewPriorityClass(),
// matching labels // matching labels
......
pkg/registry/settings/podpreset/storage/BUILD
View file @ bebb9c91
...@@ -38,7 +38,6 @@ go_test( ...@@ -38,7 +38,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/settings/podpreset/storage", importpath = "k8s.io/kubernetes/pkg/registry/settings/podpreset/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/apis/settings:go_default_library", "//pkg/apis/settings:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
......
pkg/registry/settings/podpreset/storage/storage_test.go
View file @ bebb9c91
...@@ -26,7 +26,6 @@ import ( ...@@ -26,7 +26,6 @@ import (
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/settings" "k8s.io/kubernetes/pkg/apis/settings"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
...@@ -104,7 +103,7 @@ func TestCreate(t *testing.T) { ...@@ -104,7 +103,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
invalidPodPreset := validNewPodPreset(test.TestNamespace()) invalidPodPreset := validNewPodPreset(test.TestNamespace())
invalidPodPreset.Spec.VolumeMounts[0].Name = "/cache/VolumeMounts" invalidPodPreset.Spec.VolumeMounts[0].Name = "/cache/VolumeMounts"
test.TestCreate( test.TestCreate(
...@@ -118,7 +117,7 @@ func TestUpdate(t *testing.T) { ...@@ -118,7 +117,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewPodPreset(test.TestNamespace()), validNewPodPreset(test.TestNamespace()),
...@@ -135,7 +134,7 @@ func TestDelete(t *testing.T) { ...@@ -135,7 +134,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestDelete(validNewPodPreset(test.TestNamespace())) test.TestDelete(validNewPodPreset(test.TestNamespace()))
} }
...@@ -143,7 +142,7 @@ func TestGet(t *testing.T) { ...@@ -143,7 +142,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestGet(validNewPodPreset(test.TestNamespace())) test.TestGet(validNewPodPreset(test.TestNamespace()))
} }
...@@ -151,7 +150,7 @@ func TestList(t *testing.T) { ...@@ -151,7 +150,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestList(validNewPodPreset(test.TestNamespace())) test.TestList(validNewPodPreset(test.TestNamespace()))
} }
...@@ -159,7 +158,7 @@ func TestWatch(t *testing.T) { ...@@ -159,7 +158,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme) test := genericregistrytest.New(t, storage.Store)
test.TestWatch( test.TestWatch(
validNewPodPreset(test.TestNamespace()), validNewPodPreset(test.TestNamespace()),
// matching labels // matching labels
......
pkg/registry/storage/storageclass/storage/BUILD
View file @ bebb9c91
...@@ -12,7 +12,6 @@ go_test( ...@@ -12,7 +12,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/storage/storageclass/storage", importpath = "k8s.io/kubernetes/pkg/registry/storage/storageclass/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/apis/storage:go_default_library", "//pkg/apis/storage:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
......
pkg/registry/storage/storageclass/storage/storage_test.go
View file @ bebb9c91
...@@ -26,7 +26,6 @@ import ( ...@@ -26,7 +26,6 @@ import (
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
storageapi "k8s.io/kubernetes/pkg/apis/storage" storageapi "k8s.io/kubernetes/pkg/apis/storage"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
...@@ -66,7 +65,7 @@ func TestCreate(t *testing.T) { ...@@ -66,7 +65,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
storageClass := validNewStorageClass("foo") storageClass := validNewStorageClass("foo")
storageClass.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"} storageClass.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"}
deleteReclaimPolicy := api.PersistentVolumeReclaimDelete deleteReclaimPolicy := api.PersistentVolumeReclaimDelete
...@@ -85,7 +84,7 @@ func TestUpdate(t *testing.T) { ...@@ -85,7 +84,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewStorageClass("foo"), validNewStorageClass("foo"),
...@@ -109,7 +108,7 @@ func TestDelete(t *testing.T) { ...@@ -109,7 +108,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() 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")) test.TestDelete(validNewStorageClass("foo"))
} }
...@@ -117,7 +116,7 @@ func TestGet(t *testing.T) { ...@@ -117,7 +116,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestGet(validNewStorageClass("foo")) test.TestGet(validNewStorageClass("foo"))
} }
...@@ -125,7 +124,7 @@ func TestList(t *testing.T) { ...@@ -125,7 +124,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestList(validNewStorageClass("foo")) test.TestList(validNewStorageClass("foo"))
} }
...@@ -133,7 +132,7 @@ func TestWatch(t *testing.T) { ...@@ -133,7 +132,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestWatch( test.TestWatch(
validNewStorageClass("foo"), validNewStorageClass("foo"),
// matching labels // matching labels
......
pkg/registry/storage/volumeattachment/storage/BUILD
View file @ bebb9c91
...@@ -20,7 +20,6 @@ go_test( ...@@ -20,7 +20,6 @@ go_test(
importpath = "k8s.io/kubernetes/pkg/registry/storage/volumeattachment/storage", importpath = "k8s.io/kubernetes/pkg/registry/storage/volumeattachment/storage",
library = ":go_default_library", library = ":go_default_library",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/api/testapi:go_default_library", "//pkg/api/testapi:go_default_library",
"//pkg/apis/storage:go_default_library", "//pkg/apis/storage:go_default_library",
"//pkg/registry/registrytest:go_default_library", "//pkg/registry/registrytest:go_default_library",
......
pkg/registry/storage/volumeattachment/storage/storage_test.go
View file @ bebb9c91
...@@ -27,7 +27,6 @@ import ( ...@@ -27,7 +27,6 @@ import (
"k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/generic"
genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing" genericregistrytest "k8s.io/apiserver/pkg/registry/generic/testing"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/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/api/testapi"
storageapi "k8s.io/kubernetes/pkg/apis/storage" storageapi "k8s.io/kubernetes/pkg/apis/storage"
"k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/registry/registrytest"
...@@ -74,7 +73,7 @@ func TestCreate(t *testing.T) { ...@@ -74,7 +73,7 @@ func TestCreate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
volumeAttachment := validNewVolumeAttachment("foo") volumeAttachment := validNewVolumeAttachment("foo")
volumeAttachment.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"} volumeAttachment.ObjectMeta = metav1.ObjectMeta{GenerateName: "foo"}
pvName := "foo" pvName := "foo"
...@@ -104,7 +103,7 @@ func TestUpdate(t *testing.T) { ...@@ -104,7 +103,7 @@ func TestUpdate(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestUpdate( test.TestUpdate(
// valid // valid
validNewVolumeAttachment("foo"), validNewVolumeAttachment("foo"),
...@@ -132,7 +131,7 @@ func TestDelete(t *testing.T) { ...@@ -132,7 +131,7 @@ func TestDelete(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() 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")) test.TestDelete(validNewVolumeAttachment("foo"))
} }
...@@ -145,7 +144,7 @@ func TestGet(t *testing.T) { ...@@ -145,7 +144,7 @@ func TestGet(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestGet(validNewVolumeAttachment("foo")) test.TestGet(validNewVolumeAttachment("foo"))
} }
...@@ -158,7 +157,7 @@ func TestList(t *testing.T) { ...@@ -158,7 +157,7 @@ func TestList(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestList(validNewVolumeAttachment("foo")) test.TestList(validNewVolumeAttachment("foo"))
} }
...@@ -171,7 +170,7 @@ func TestWatch(t *testing.T) { ...@@ -171,7 +170,7 @@ func TestWatch(t *testing.T) {
storage, server := newStorage(t) storage, server := newStorage(t)
defer server.Terminate(t) defer server.Terminate(t)
defer storage.Store.DestroyFunc() defer storage.Store.DestroyFunc()
test := genericregistrytest.New(t, storage.Store, legacyscheme.Scheme).ClusterScope() test := genericregistrytest.New(t, storage.Store).ClusterScope()
test.TestWatch( test.TestWatch(
validNewVolumeAttachment("foo"), validNewVolumeAttachment("foo"),
// matching labels // matching labels
......
staging/src/k8s.io/apiserver/pkg/registry/generic/testing/tester.go
View file @ bebb9c91
...@@ -39,9 +39,9 @@ type Tester struct { ...@@ -39,9 +39,9 @@ type Tester struct {
} }
type UpdateFunc func(runtime.Object) runtime.Object type UpdateFunc func(runtime.Object) runtime.Object
func New(t *testing.T, storage *genericregistry.Store, scheme *runtime.Scheme) *Tester { func New(t *testing.T, storage *genericregistry.Store) *Tester {
return &Tester{ return &Tester{
tester: resttest.New(t, storage, scheme), tester: resttest.New(t, storage),
storage: storage, storage: storage,
} }
} }
......
staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go
View file @ bebb9c91
...@@ -47,15 +47,13 @@ type Tester struct { ...@@ -47,15 +47,13 @@ type Tester struct {
generatesName bool generatesName bool
returnDeletedObject bool returnDeletedObject bool
namer func(int) string namer func(int) string
scheme *runtime.Scheme
} }
func New(t *testing.T, storage rest.Storage, scheme *runtime.Scheme) *Tester { func New(t *testing.T, storage rest.Storage) *Tester {
return &Tester{ return &Tester{
T: t, T: t,
storage: storage, storage: storage,
namer: defaultNamer, namer: defaultNamer,
scheme: scheme,
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment