Skip to content

e2e: fix PreserveCase flaky #5966

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
merged 2 commits into from
May 9, 2025
Merged

e2e: fix PreserveCase flaky #5966

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d954101
e2e: fix PreserveCase flaky
zirain May 8, 2025
eb8f20c
fix
zirain May 8, 2025
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
51 changes: 32 additions & 19 deletions test/e2e/tests/preservecase.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,16 @@ import (
"net/http/httputil"
"regexp"
"testing"
"time"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait"
"sigs.k8s.io/gateway-api/conformance/utils/http"
"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
"sigs.k8s.io/gateway-api/conformance/utils/roundtripper"
"sigs.k8s.io/gateway-api/conformance/utils/suite"
"sigs.k8s.io/gateway-api/conformance/utils/tlog"
)

func init() {
Expand Down Expand Up @@ -113,27 +116,37 @@ var PreserveCaseTest = suite.ConformanceTest{
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeAccepted(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN)

WaitForPods(t, suite.Client, "gateway-preserve-case-backend", map[string]string{"app": "preserve-case"}, corev1.PodRunning, PodReady)
// Can't use the standard method for checking the response, since the remote side isn't the
// conformance echo server and it returns a differently formatted response.
expectedResponse := http.ExpectedResponse{
Request: http.Request{
Path: "/preserve?headers=ReSpOnSeHeAdEr",
Headers: map[string]string{
"SpEcIaL": "Header",
},
},
Namespace: ns,
}

var rt nethttp.RoundTripper
req := http.MakeRequest(t, &expectedResponse, gwAddr, "HTTP", "http")
respBody, err := casePreservingRoundTrip(req, rt, suite)
err := wait.PollUntilContextTimeout(context.TODO(), time.Second, suite.TimeoutConfig.DeleteTimeout, true, func(ctx context.Context) (bool, error) {
// Can't use the standard method for checking the response, since the remote side isn't the
// conformance echo server and it returns a differently formatted response.
expectedResponse := http.ExpectedResponse{
Request: http.Request{
Path: "/preserve?headers=ReSpOnSeHeAdEr",
Headers: map[string]string{
"SpEcIaL": "Header",
},
},
Namespace: ns,
}

var rt nethttp.RoundTripper
req := http.MakeRequest(t, &expectedResponse, gwAddr, "HTTP", "http")
respBody, err := casePreservingRoundTrip(req, rt, suite)
if err != nil {
tlog.Logf(t, "failed to get expected response: %v", err)
return false, nil
}

if _, found := respBody["SpEcIaL"]; !found {
tlog.Logf(t, "case was not preserved for test header: %+v", respBody)
return false, nil
}

return true, nil
})
if err != nil {
t.Errorf("failed to get expected response: %v", err)
}

if _, found := respBody["SpEcIaL"]; !found {
t.Errorf("case was not preserved for test header: %+v", respBody)
tlog.Errorf(t, "failed to get expected response: %v", err)
}
})
},
Expand Down