github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix e2e failure of events test.

pull/6/head
Eric Tune 2014-12-02 11:01:24 -08:00
parent 993ef88eec
commit a7718054a8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/e2e/e2e.go
View File

@ -199,21 +199,21 @@ func TestKubeletSendsEvent(c *client.Client) bool {
return false return false
} }
_, err = podClient.Get(pod.Name) podWithUid, err := podClient.Get(pod.Name)
if err != nil { if err != nil {
glog.Errorf("Failed to get pod: %v", err) glog.Errorf("Failed to get pod: %v", err)
return false return false
} }
// Check for scheduler event about the pod. // Check for scheduler event about the pod.
glog.Infof("%+v", podWithUid)
events, err := c.Events(api.NamespaceDefault).List( events, err := c.Events(api.NamespaceDefault).List(
labels.Everything(), labels.Everything(),
labels.Set{ labels.Set{
"involvedObject.name": pod.Name,
"involvedObject.kind": "Pod", "involvedObject.kind": "Pod",
"involvedObject.uid": podWithUid.UID,
"involvedObject.namespace": api.NamespaceDefault, "involvedObject.namespace": api.NamespaceDefault,
"source": "scheduler", "source": "scheduler",
"time": value,
}.AsSelector(), }.AsSelector(),
) )
if err != nil { if err != nil {
@ -230,7 +230,7 @@ func TestKubeletSendsEvent(c *client.Client) bool {
events, err = c.Events(api.NamespaceDefault).List( events, err = c.Events(api.NamespaceDefault).List(
labels.Everything(), labels.Everything(),
labels.Set{ labels.Set{
"involvedObject.name": pod.Name, "involvedObject.uid": podWithUid.UID,
"involvedObject.kind": "BoundPod", "involvedObject.kind": "BoundPod",
"involvedObject.namespace": api.NamespaceDefault, "involvedObject.namespace": api.NamespaceDefault,
"source": "kubelet", "source": "kubelet",