Skip to content

Bug 1906508: test/e2e: Don't clobber err in TestHeaderNameCaseAdjust #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Dec 18, 2020
Merged

Bug 1906508: test/e2e: Don't clobber err in TestHeaderNameCaseAdjust #512

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions test/e2e/http_header_name_case_adjustment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ func TestHeaderNameCaseAdjustment(t *testing.T) {
}
}()

err = wait.PollImmediate(1*time.Second, 5*time.Minute, func() (bool, error) {
pollErr := wait.PollImmediate(1*time.Second, 5*time.Minute, func() (bool, error) {
readCloser, err := client.CoreV1().Pods(clientPod.Namespace).GetLogs(clientPod.Name, &corev1.PodLogOptions{
Container: "curl",
Follow: false,
Expand Down Expand Up @@ -148,7 +148,7 @@ func TestHeaderNameCaseAdjustment(t *testing.T) {
}
return true, nil
})
if err != nil {
if pollErr != nil {
pod := &corev1.Pod{}
podName := types.NamespacedName{
Namespace: clientPod.Namespace,
Expand All @@ -166,6 +166,6 @@ func TestHeaderNameCaseAdjustment(t *testing.T) {
t.Errorf("failed to get logs from pod %s: %v", clientPod.Name, err)
}

t.Fatalf("failed to observe the expected output: %v\nclient pod spec: %#v\nclient pod logs:\n%s", err, pod, logs)
t.Fatalf("failed to observe the expected output: %v\nclient pod spec: %#v\nclient pod logs:\n%s", pollErr, pod, logs)
}
}