kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update initializer names to valid ones in tests 

Kubernetes-commit: 85ee09e4c901e9fcf725bb4797ea2b3c278ee96c
This commit is contained in:
Chao Xu 2017-08-28 15:04:09 -07:00 committed by Kubernetes Publisher
parent ac35203d6c
commit 6a1592b4e4
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/registry/generic/registry/store_test.go
View File

@ -60,6 +60,8 @@ import (
var scheme = runtime.NewScheme() var scheme = runtime.NewScheme()
var codecs = serializer.NewCodecFactory(scheme) var codecs = serializer.NewCodecFactory(scheme)
const validInitializerName = "test.k8s.io"
func init() { func init() {
metav1.AddToGroupVersion(scheme, metav1.SchemeGroupVersion) metav1.AddToGroupVersion(scheme, metav1.SchemeGroupVersion)
example.AddToScheme(scheme) example.AddToScheme(scheme)
@ -399,7 +401,7 @@ func TestStoreCreateInitialized(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "foo", Namespace: "test", Name: "foo", Namespace: "test",
Initializers: &metav1.Initializers{ Initializers: &metav1.Initializers{
Pending: []metav1.Initializer{{Name: "Test"}}, Pending: []metav1.Initializer{{Name: validInitializerName}},
}, },
}, },
Spec: example.PodSpec{NodeName: "machine"}, Spec: example.PodSpec{NodeName: "machine"},
@ -427,7 +429,7 @@ func TestStoreCreateInitialized(t *testing.T) {
defer w.Stop() defer w.Stop()
event := <-w.ResultChan() event := <-w.ResultChan()
pod := event.Object.(*example.Pod) pod := event.Object.(*example.Pod)
if event.Type != watch.Added || !hasInitializers(pod, "Test") { if event.Type != watch.Added || !hasInitializers(pod, validInitializerName) {
t.Fatalf("unexpected event: %s %#v", event.Type, event.Object) t.Fatalf("unexpected event: %s %#v", event.Type, event.Object)
} }
@ -504,7 +506,7 @@ func TestStoreCreateInitializedFailed(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "foo", Namespace: "test", Name: "foo", Namespace: "test",
Initializers: &metav1.Initializers{ Initializers: &metav1.Initializers{
Pending: []metav1.Initializer{{Name: "Test"}}, Pending: []metav1.Initializer{{Name: validInitializerName}},
}, },
}, },
Spec: example.PodSpec{NodeName: "machine"}, Spec: example.PodSpec{NodeName: "machine"},
@ -526,7 +528,7 @@ func TestStoreCreateInitializedFailed(t *testing.T) {
} }
event := <-w.ResultChan() event := <-w.ResultChan()
pod := event.Object.(*example.Pod) pod := event.Object.(*example.Pod)
if event.Type != watch.Added || !hasInitializers(pod, "Test") { if event.Type != watch.Added || !hasInitializers(pod, validInitializerName) {
t.Fatalf("unexpected event: %s %#v", event.Type, event.Object) t.Fatalf("unexpected event: %s %#v", event.Type, event.Object)
} }
pod.Initializers.Pending = nil pod.Initializers.Pending = nil
@ -856,7 +858,7 @@ func TestStoreDelete(t *testing.T) {
func TestStoreDeleteUninitialized(t *testing.T) { func TestStoreDeleteUninitialized(t *testing.T) {
podA := &example.Pod{ podA := &example.Pod{
ObjectMeta: metav1.ObjectMeta{Name: "foo", Initializers: &metav1.Initializers{Pending: []metav1.Initializer{{Name: "Testing"}}}}, ObjectMeta: metav1.ObjectMeta{Name: "foo", Initializers: &metav1.Initializers{Pending: []metav1.Initializer{{Name: validInitializerName}}}},
Spec: example.PodSpec{NodeName: "machine"}, Spec: example.PodSpec{NodeName: "machine"},
} }
@ -1002,7 +1004,7 @@ func TestFailedInitializationStoreUpdate(t *testing.T) {
initialGeneration := int64(1) initialGeneration := int64(1)
podInitializing := &example.Pod{ podInitializing := &example.Pod{
ObjectMeta: metav1.ObjectMeta{Name: "foo", Initializers: &metav1.Initializers{Pending: []metav1.Initializer{{Name: "Test"}}}, Generation: initialGeneration}, ObjectMeta: metav1.ObjectMeta{Name: "foo", Initializers: &metav1.Initializers{Pending: []metav1.Initializer{{Name: validInitializerName}}}, Generation: initialGeneration},
Spec: example.PodSpec{NodeName: "machine"}, Spec: example.PodSpec{NodeName: "machine"},
} }
@ -1617,7 +1619,7 @@ func TestStoreDeleteCollection(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "baz", Name: "baz",
Initializers: &metav1.Initializers{ Initializers: &metav1.Initializers{
Pending: []metav1.Initializer{{Name: "Test"}}, Pending: []metav1.Initializer{{Name: validInitializerName}},
}, },
}, },
} }