Skip to content

K
k3s
Commit ede2fa2c authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #27766 from sttts/sttts-portforward-e2e-more-logs

Automatic merge from submit-queue portforward e2e: extend log for flake hunting For some more insight into flake https://github.com/kubernetes/kubernetes/issues/27680
parents d8d5ab29 1beb2b31
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 30 deletions
test/e2e/portforward.go
View file @ ede2fa2c
...@@ -183,6 +183,14 @@ var _ = framework.KubeDescribe("Port forwarding", func() { ...@@ -183,6 +183,14 @@ var _ = framework.KubeDescribe("Port forwarding", func() {
if err := f.WaitForPodRunning(pod.Name); err != nil { if err := f.WaitForPodRunning(pod.Name); err != nil {
framework.Failf("Pod did not start running: %v", err) framework.Failf("Pod did not start running: %v", err)
} }
defer func() {
logs, err := framework.GetPodLogs(f.Client, f.Namespace.Name, pod.Name, "portforwardtester")
if err != nil {
framework.Logf("Error getting pod log: %v", err)
} else {
framework.Logf("Pod log:\n%s", logs)
}
}()
By("Running 'kubectl port-forward'") By("Running 'kubectl port-forward'")
cmd := runPortForward(f.Namespace.Name, pod.Name, 80) cmd := runPortForward(f.Namespace.Name, pod.Name, 80)
...@@ -198,20 +206,15 @@ var _ = framework.KubeDescribe("Port forwarding", func() { ...@@ -198,20 +206,15 @@ var _ = framework.KubeDescribe("Port forwarding", func() {
conn.Close() conn.Close()
By("Waiting for the target pod to stop running") By("Waiting for the target pod to stop running")
waitErr := f.WaitForPodNoLongerRunning(pod.Name) if err := f.WaitForPodNoLongerRunning(pod.Name); err != nil {
framework.Failf("Pod did not stop running: %v", err)
}
By("Retrieving logs from the target pod") By("Verifying logs")
logOutput, err := framework.GetPodLogs(f.Client, f.Namespace.Name, pod.Name, "portforwardtester") logOutput, err := framework.GetPodLogs(f.Client, f.Namespace.Name, pod.Name, "portforwardtester")
if err != nil { if err != nil {
framework.Failf("Error retrieving logs: %v", err) framework.Failf("Error retrieving pod logs: %v", err)
}
if waitErr != nil {
framework.Logf("Pod log:\n%s", logOutput)
framework.Failf("Pod did not stop running: %v", waitErr)
} }
By("Verifying logs")
verifyLogMessage(logOutput, "Accepted client connection") verifyLogMessage(logOutput, "Accepted client connection")
verifyLogMessage(logOutput, "Expected to read 3 bytes from client, but got 0 instead") verifyLogMessage(logOutput, "Expected to read 3 bytes from client, but got 0 instead")
}) })
...@@ -225,6 +228,14 @@ var _ = framework.KubeDescribe("Port forwarding", func() { ...@@ -225,6 +228,14 @@ var _ = framework.KubeDescribe("Port forwarding", func() {
if err := f.WaitForPodRunning(pod.Name); err != nil { if err := f.WaitForPodRunning(pod.Name); err != nil {
framework.Failf("Pod did not start running: %v", err) framework.Failf("Pod did not start running: %v", err)
} }
defer func() {
logs, err := framework.GetPodLogs(f.Client, f.Namespace.Name, pod.Name, "portforwardtester")
if err != nil {
framework.Logf("Error getting pod log: %v", err)
} else {
framework.Logf("Pod log:\n%s", logs)
}
}()
By("Running 'kubectl port-forward'") By("Running 'kubectl port-forward'")
cmd := runPortForward(f.Namespace.Name, pod.Name, 80) cmd := runPortForward(f.Namespace.Name, pod.Name, 80)
...@@ -261,20 +272,15 @@ var _ = framework.KubeDescribe("Port forwarding", func() { ...@@ -261,20 +272,15 @@ var _ = framework.KubeDescribe("Port forwarding", func() {
} }
By("Waiting for the target pod to stop running") By("Waiting for the target pod to stop running")
waitErr := f.WaitForPodNoLongerRunning(pod.Name) if err := f.WaitForPodNoLongerRunning(pod.Name); err != nil {
framework.Failf("Pod did not stop running: %v", err)
}
By("Retrieving logs from the target pod") By("Verifying logs")
logOutput, err := framework.GetPodLogs(f.Client, f.Namespace.Name, pod.Name, "portforwardtester") logOutput, err := framework.GetPodLogs(f.Client, f.Namespace.Name, pod.Name, "portforwardtester")
if err != nil { if err != nil {
framework.Failf("Error retrieving logs: %v", err) framework.Failf("Error retrieving pod logs: %v", err)
} }
if waitErr != nil {
framework.Logf("Pod log:\n%s", logOutput)
framework.Failf("Pod did not stop running: %v", waitErr)
}
By("Verifying logs")
verifyLogMessage(logOutput, "^Accepted client connection$") verifyLogMessage(logOutput, "^Accepted client connection$")
verifyLogMessage(logOutput, "^Received expected client data$") verifyLogMessage(logOutput, "^Received expected client data$")
verifyLogMessage(logOutput, "^Done$") verifyLogMessage(logOutput, "^Done$")
...@@ -290,6 +296,14 @@ var _ = framework.KubeDescribe("Port forwarding", func() { ...@@ -290,6 +296,14 @@ var _ = framework.KubeDescribe("Port forwarding", func() {
if err := f.WaitForPodRunning(pod.Name); err != nil { if err := f.WaitForPodRunning(pod.Name); err != nil {
framework.Failf("Pod did not start running: %v", err) framework.Failf("Pod did not start running: %v", err)
} }
defer func() {
logs, err := framework.GetPodLogs(f.Client, f.Namespace.Name, pod.Name, "portforwardtester")
if err != nil {
framework.Logf("Error getting pod log: %v", err)
} else {
framework.Logf("Pod log:\n%s", logs)
}
}()
By("Running 'kubectl port-forward'") By("Running 'kubectl port-forward'")
cmd := runPortForward(f.Namespace.Name, pod.Name, 80) cmd := runPortForward(f.Namespace.Name, pod.Name, 80)
...@@ -316,20 +330,15 @@ var _ = framework.KubeDescribe("Port forwarding", func() { ...@@ -316,20 +330,15 @@ var _ = framework.KubeDescribe("Port forwarding", func() {
} }
By("Waiting for the target pod to stop running") By("Waiting for the target pod to stop running")
waitErr := f.WaitForPodNoLongerRunning(pod.Name) if err := f.WaitForPodNoLongerRunning(pod.Name); err != nil {
framework.Failf("Pod did not stop running: %v", err)
}
By("Retrieving logs from the target pod") By("Verifying logs")
logOutput, err := framework.GetPodLogs(f.Client, f.Namespace.Name, pod.Name, "portforwardtester") logOutput, err := framework.GetPodLogs(f.Client, f.Namespace.Name, pod.Name, "portforwardtester")
if err != nil { if err != nil {
framework.Failf("Error retrieving logs: %v", err) framework.Failf("Error retrieving pod logs: %v", err)
}
if waitErr != nil {
framework.Logf("Pod log:\n%s", logOutput)
framework.Failf("Pod did not stop running: %v", waitErr)
} }
By("Verifying logs")
verifyLogMessage(logOutput, "Accepted client connection") verifyLogMessage(logOutput, "Accepted client connection")
verifyLogMessage(logOutput, "Done") verifyLogMessage(logOutput, "Done")
}) })
......
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