Skip to content

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

Merge pull request #31632 from vishh/issue-30567

Automatic merge from submit-queue Fix pod get logs test Helps debug #30567.
parents 956501b1 8e29b981
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
test/e2e/common/pods.go
View file @ d1154ce9
...@@ -530,17 +530,13 @@ var _ = framework.KubeDescribe("Pods", func() { ...@@ -530,17 +530,13 @@ var _ = framework.KubeDescribe("Pods", func() {
{ {
Name: "main", Name: "main",
Image: "gcr.io/google_containers/busybox:1.24", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{"/bin/sh", "-c", "echo container is alive; sleep 600"}, Command: []string{"/bin/sh", "-c", "echo container is alive; sleep 10000"},
}, },
}, },
}, },
} }
By("submitting the pod to kubernetes") By("submitting the pod to kubernetes")
defer func() {
By("deleting the pod")
podClient.Delete(pod.Name, api.NewDeleteOptions(0))
}()
podClient.CreateSync(pod) podClient.CreateSync(pod)
req := f.Client.Get(). req := f.Client.Get().
...@@ -566,7 +562,7 @@ var _ = framework.KubeDescribe("Pods", func() { ...@@ -566,7 +562,7 @@ var _ = framework.KubeDescribe("Pods", func() {
} }
framework.Failf("Failed to read completely from websocket %s: %v", url.String(), err) framework.Failf("Failed to read completely from websocket %s: %v", url.String(), err)
} }
if len(msg) == 0 { if len(strings.TrimSpace(string(msg))) == 0 {
continue continue
} }
buf.Write(msg) buf.Write(msg)
......
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