update fieldPath in event_test.go to v1

pull/6/head
Chao Xu 2015-06-09 10:45:46 -07:00
parent dafe79e5de
commit 030099a5bd
1 changed files with 17 additions and 17 deletions

View File

@ -73,8 +73,8 @@ func TestEventf(t *testing.T) {
UID: "differentUid", UID: "differentUid",
}, },
} }
testRef, err := api.GetPartialReference(testPod, "desiredState.manifest.containers[2]") testRef, err := api.GetPartialReference(testPod, "spec.containers[2]")
testRef2, err := api.GetPartialReference(testPod2, "desiredState.manifest.containers[3]") testRef2, err := api.GetPartialReference(testPod2, "spec.containers[3]")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -103,14 +103,14 @@ func TestEventf(t *testing.T) {
Namespace: "baz", Namespace: "baz",
UID: "bar", UID: "bar",
APIVersion: "version", APIVersion: "version",
FieldPath: "desiredState.manifest.containers[2]", FieldPath: "spec.containers[2]",
}, },
Reason: "Started", Reason: "Started",
Message: "some verbose message: 1", Message: "some verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 1, Count: 1,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"desiredState.manifest.containers[2]"}): reason: 'Started' some verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[2]"}): reason: 'Started' some verbose message: 1`,
expectUpdate: false, expectUpdate: false,
}, },
{ {
@ -154,14 +154,14 @@ func TestEventf(t *testing.T) {
Namespace: "baz", Namespace: "baz",
UID: "bar", UID: "bar",
APIVersion: "version", APIVersion: "version",
FieldPath: "desiredState.manifest.containers[2]", FieldPath: "spec.containers[2]",
}, },
Reason: "Started", Reason: "Started",
Message: "some verbose message: 1", Message: "some verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 2, Count: 2,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"desiredState.manifest.containers[2]"}): reason: 'Started' some verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[2]"}): reason: 'Started' some verbose message: 1`,
expectUpdate: true, expectUpdate: true,
}, },
{ {
@ -180,14 +180,14 @@ func TestEventf(t *testing.T) {
Namespace: "baz", Namespace: "baz",
UID: "differentUid", UID: "differentUid",
APIVersion: "version", APIVersion: "version",
FieldPath: "desiredState.manifest.containers[3]", FieldPath: "spec.containers[3]",
}, },
Reason: "Started", Reason: "Started",
Message: "some verbose message: 1", Message: "some verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 1, Count: 1,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"differentUid", APIVersion:"version", ResourceVersion:"", FieldPath:"desiredState.manifest.containers[3]"}): reason: 'Started' some verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"differentUid", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[3]"}): reason: 'Started' some verbose message: 1`,
expectUpdate: false, expectUpdate: false,
}, },
{ {
@ -206,14 +206,14 @@ func TestEventf(t *testing.T) {
Namespace: "baz", Namespace: "baz",
UID: "bar", UID: "bar",
APIVersion: "version", APIVersion: "version",
FieldPath: "desiredState.manifest.containers[2]", FieldPath: "spec.containers[2]",
}, },
Reason: "Started", Reason: "Started",
Message: "some verbose message: 1", Message: "some verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 3, Count: 3,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"desiredState.manifest.containers[2]"}): reason: 'Started' some verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[2]"}): reason: 'Started' some verbose message: 1`,
expectUpdate: true, expectUpdate: true,
}, },
{ {
@ -232,14 +232,14 @@ func TestEventf(t *testing.T) {
Namespace: "baz", Namespace: "baz",
UID: "differentUid", UID: "differentUid",
APIVersion: "version", APIVersion: "version",
FieldPath: "desiredState.manifest.containers[3]", FieldPath: "spec.containers[3]",
}, },
Reason: "Stopped", Reason: "Stopped",
Message: "some verbose message: 1", Message: "some verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 1, Count: 1,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"differentUid", APIVersion:"version", ResourceVersion:"", FieldPath:"desiredState.manifest.containers[3]"}): reason: 'Stopped' some verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"differentUid", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[3]"}): reason: 'Stopped' some verbose message: 1`,
expectUpdate: false, expectUpdate: false,
}, },
{ {
@ -258,14 +258,14 @@ func TestEventf(t *testing.T) {
Namespace: "baz", Namespace: "baz",
UID: "differentUid", UID: "differentUid",
APIVersion: "version", APIVersion: "version",
FieldPath: "desiredState.manifest.containers[3]", FieldPath: "spec.containers[3]",
}, },
Reason: "Stopped", Reason: "Stopped",
Message: "some verbose message: 1", Message: "some verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 2, Count: 2,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"differentUid", APIVersion:"version", ResourceVersion:"", FieldPath:"desiredState.manifest.containers[3]"}): reason: 'Stopped' some verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"differentUid", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[3]"}): reason: 'Stopped' some verbose message: 1`,
expectUpdate: true, expectUpdate: true,
}, },
} }
@ -482,7 +482,7 @@ func TestEventfNoNamespace(t *testing.T) {
UID: "bar", UID: "bar",
}, },
} }
testRef, err := api.GetPartialReference(testPod, "desiredState.manifest.containers[2]") testRef, err := api.GetPartialReference(testPod, "spec.containers[2]")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -511,14 +511,14 @@ func TestEventfNoNamespace(t *testing.T) {
Namespace: "", Namespace: "",
UID: "bar", UID: "bar",
APIVersion: "version", APIVersion: "version",
FieldPath: "desiredState.manifest.containers[2]", FieldPath: "spec.containers[2]",
}, },
Reason: "Started", Reason: "Started",
Message: "some verbose message: 1", Message: "some verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 1, Count: 1,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"desiredState.manifest.containers[2]"}): reason: 'Started' some verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[2]"}): reason: 'Started' some verbose message: 1`,
expectUpdate: false, expectUpdate: false,
}, },
} }