Skip to content

Bug 1887934: TestForwardedHeaderPolicy*: Make case-insensitive #474

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 2 commits into from
Oct 13, 2020
Merged

Bug 1887934: TestForwardedHeaderPolicy*: Make case-insensitive #474

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
999e7fa
TestForwardedHeaderPolicy*: Show pod logs if failed
Miciah Oct 12, 2020
ef0c865
TestForwardedHeaderPolicy*: Make case-insensitive
Miciah Oct 13, 2020
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
25 changes: 22 additions & 3 deletions test/e2e/forwarded_header_policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ var testPodCount int

// testRouteHeaders connects to the specified route using the provided address
// and verifies that the response has the expected number of matches of the
// expected string.
// expected string. Case is ignored when comparing the expected response and
// the actual response.
func testRouteHeaders(t *testing.T, image string, route *routev1.Route, address string, headers []string, expectedResponse string, expectedMatches int) {
t.Helper()

Expand Down Expand Up @@ -62,6 +63,7 @@ func testRouteHeaders(t *testing.T, image string, route *routev1.Route, address
}
}
}()
expectedResponse = strings.ToLower(expectedResponse)
err = wait.PollImmediate(1*time.Second, 4*time.Minute, func() (bool, error) {
readCloser, err := client.CoreV1().Pods(clientPod.Namespace).GetLogs(clientPod.Name, &corev1.PodLogOptions{
Container: "curl",
Expand All @@ -80,7 +82,7 @@ func testRouteHeaders(t *testing.T, image string, route *routev1.Route, address
var numMatches int
for scanner.Scan() {
line := scanner.Text()
if strings.Contains(line, expectedResponse) {
if strings.Contains(strings.ToLower(line), expectedResponse) {
numMatches++
t.Logf("found match %d of %d expected: %s", numMatches, expectedMatches, line)
}
Expand All @@ -91,7 +93,24 @@ func testRouteHeaders(t *testing.T, image string, route *routev1.Route, address
return numMatches == expectedMatches, nil
})
if err != nil {
t.Fatalf("failed to observe the expected output: %v", err)
pod := &corev1.Pod{}
podName := types.NamespacedName{
Namespace: clientPod.Namespace,
Name: clientPod.Name,
}
if err := kclient.Get(context.TODO(), podName, pod); err != nil {
t.Errorf("failed to get pod %s: %v", clientPod.Name, err)
}

logs, err := client.CoreV1().Pods(clientPod.Namespace).GetLogs(clientPod.Name, &corev1.PodLogOptions{
Container: "curl",
Follow: false,
}).DoRaw(context.TODO())
if err != nil {
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)
}
}

Expand Down