github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #113158 from pacoxu/fix-flake-kubectl

Browse Source 
kubectl-e2e: the event rendering may have 3 or 4 whitespaces
This commit is contained in:
Kubernetes Prow Robot 2022-10-19 04:51:02 -07:00 committed by GitHub
commit ab8563b6de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/kubectl/kubectl.go
View File

@ -1942,7 +1942,7 @@ metadata:
}) })
ginkgo.Describe("Kubectl events", func() { ginkgo.Describe("Kubectl events", func() {
ginkgo.It("should show event when pod is created ", func() { ginkgo.It("should show event when pod is created", func() {
podName := "e2e-test-httpd-pod" podName := "e2e-test-httpd-pod"
ginkgo.By("running the image " + httpdImage) ginkgo.By("running the image " + httpdImage)
e2ekubectl.RunKubectlOrDie(ns, "run", podName, "--image="+httpdImage, podRunningTimeoutArg, "--labels=run="+podName) e2ekubectl.RunKubectlOrDie(ns, "run", podName, "--image="+httpdImage, podRunningTimeoutArg, "--labels=run="+podName)
@ -1957,7 +1957,9 @@ metadata:
ginkgo.By("show started event for this pod") ginkgo.By("show started event for this pod")
events := e2ekubectl.RunKubectlOrDie(ns, "alpha", "events", "--for=pod/"+podName) events := e2ekubectl.RunKubectlOrDie(ns, "alpha", "events", "--for=pod/"+podName)
if !strings.Contains(events, fmt.Sprintf("Normal Scheduled Pod/%s", podName)) { // replace multi spaces into single white space
eventsStr := strings.Join(strings.Fields(strings.TrimSpace(events)), " ")
if !strings.Contains(string(eventsStr), fmt.Sprintf("Normal Scheduled Pod/%s", podName)) {
framework.Failf("failed to list expected event") framework.Failf("failed to list expected event")
} }