Skip to content

make timeout configurable #1292

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 1 commit into from
Aug 5, 2022
Merged

make timeout configurable #1292

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion conformance/tests/gateway-secret-invalid-reference-grant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ var GatewaySecretInvalidReferenceGrant = suite.ConformanceTest{
}},
}}

kubernetes.GatewayStatusMustHaveListeners(t, s.Client, gwNN, listeners, 60)
kubernetes.GatewayStatusMustHaveListeners(t, s.Client, s.TimeoutConfig, gwNN, listeners)
})
},
}
2 changes: 1 addition & 1 deletion conformance/tests/gateway-secret-missing-reference-grant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ var GatewaySecretMissingReferenceGrant = suite.ConformanceTest{
}},
}}

kubernetes.GatewayStatusMustHaveListeners(t, s.Client, gwNN, listeners, 60)
kubernetes.GatewayStatusMustHaveListeners(t, s.Client, s.TimeoutConfig, gwNN, listeners)
})
},
}
2 changes: 1 addition & 1 deletion conformance/tests/gateway-secret-reference-grant-all-in-namespace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ var GatewaySecretReferenceGrantAllInNamespace = suite.ConformanceTest{
},
}}

kubernetes.GatewayStatusMustHaveListeners(t, s.Client, gwNN, listeners, 60)
kubernetes.GatewayStatusMustHaveListeners(t, s.Client, s.TimeoutConfig, gwNN, listeners)
})
},
}
2 changes: 1 addition & 1 deletion conformance/tests/gateway-secret-reference-grant-specific.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ var GatewaySecretReferenceGrantSpecific = suite.ConformanceTest{
},
}}

kubernetes.GatewayStatusMustHaveListeners(t, s.Client, gwNN, listeners, 60)
kubernetes.GatewayStatusMustHaveListeners(t, s.Client, s.TimeoutConfig, gwNN, listeners)
})
},
}
4 changes: 2 additions & 2 deletions conformance/tests/httproute-cross-namespace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ var HTTPRouteCrossNamespace = suite.ConformanceTest{
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
routeNN := types.NamespacedName{Name: "cross-namespace", Namespace: "gateway-conformance-web-backend"}
gwNN := types.NamespacedName{Name: "backend-namespaces", Namespace: "gateway-conformance-infra"}
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN)
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN)

t.Run("Simple HTTP request should reach web-backend", func(t *testing.T) {
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, gwAddr, http.ExpectedResponse{
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, gwAddr, http.ExpectedResponse{
Request: http.Request{Path: "/"},
StatusCode: 200,
Backend: "web-backend",
Expand Down
4 changes: 2 additions & 2 deletions conformance/tests/httproute-disallowed-kind.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ var HTTPRouteDisallowedKind = suite.ConformanceTest{
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
// This test creates an additional Gateway in the gateway-conformance-infra
// namespace so we have to wait for it to be ready.
kubernetes.NamespacesMustBeReady(t, suite.Client, []string{"gateway-conformance-infra"}, 300)
kubernetes.NamespacesMustBeReady(t, suite.Client, suite.TimeoutConfig, []string{"gateway-conformance-infra"})

routeName := types.NamespacedName{Name: "disallowed-kind", Namespace: "gateway-conformance-infra"}
gwName := types.NamespacedName{Name: "tlsroutes-only", Namespace: "gateway-conformance-infra"}

t.Run("Route should not have Parents set in status", func(t *testing.T) {
kubernetes.HTTPRouteMustHaveNoAcceptedParents(t, suite.Client, routeName, 60)
kubernetes.HTTPRouteMustHaveNoAcceptedParents(t, suite.Client, suite.TimeoutConfig, routeName)
})

t.Run("Gateway should have 0 Routes attached", func(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions conformance/tests/httproute-exact-path-matching.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var HTTPExactPathMatching = suite.ConformanceTest{
ns := "gateway-conformance-infra"
routeNN := types.NamespacedName{Name: "exact-matching", Namespace: ns}
gwNN := types.NamespacedName{Name: "same-namespace", Namespace: ns}
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN)
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN)

testCases := []http.ExpectedResponse{
{
Expand Down Expand Up @@ -67,7 +67,7 @@ var HTTPExactPathMatching = suite.ConformanceTest{
tc := testCases[i]
t.Run(testName(tc, i), func(t *testing.T) {
t.Parallel()
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, gwAddr, tc)
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, gwAddr, tc)
})
}
},
Expand Down
4 changes: 2 additions & 2 deletions conformance/tests/httproute-header-matching.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var HTTPRouteHeaderMatching = suite.ConformanceTest{
ns := "gateway-conformance-infra"
routeNN := types.NamespacedName{Name: "header-matching", Namespace: ns}
gwNN := types.NamespacedName{Name: "same-namespace", Namespace: ns}
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN)
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN)

testCases := []http.ExpectedResponse{{
Request: http.Request{Path: "/", Headers: map[string]string{"Version": "one"}},
Expand Down Expand Up @@ -85,7 +85,7 @@ var HTTPRouteHeaderMatching = suite.ConformanceTest{
tc := testCases[i]
t.Run(testName(tc, i), func(t *testing.T) {
t.Parallel()
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, gwAddr, tc)
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, gwAddr, tc)
})
}
},
Expand Down
12 changes: 6 additions & 6 deletions conformance/tests/httproute-hostname-intersection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ var HTTPRouteHostnameIntersection = suite.ConformanceTest{

// This test creates an additional Gateway in the gateway-conformance-infra
// namespace so we have to wait for it to be ready.
kubernetes.NamespacesMustBeReady(t, suite.Client, []string{ns}, 300)
kubernetes.NamespacesMustBeReady(t, suite.Client, suite.TimeoutConfig, []string{ns})

t.Run("HTTPRoutes that do intersect with listener hostnames", func(t *testing.T) {
routes := []types.NamespacedName{
Expand All @@ -51,7 +51,7 @@ var HTTPRouteHostnameIntersection = suite.ConformanceTest{
{Namespace: ns, Name: "wildcard-host-matches-listener-specific-host"},
{Namespace: ns, Name: "wildcard-host-matches-listener-wildcard-host"},
}
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routes...)
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routes...)

var testCases []http.ExpectedResponse

Expand Down Expand Up @@ -183,13 +183,13 @@ var HTTPRouteHostnameIntersection = suite.ConformanceTest{
tc := testCases[i]
t.Run(testName(tc, i), func(t *testing.T) {
t.Parallel()
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, gwAddr, tc)
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, gwAddr, tc)
})
}
})

t.Run("HTTPRoutes that do not intersect with listener hostnames", func(t *testing.T) {
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.ControllerName, kubernetes.NewGatewayRef(gwNN))
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN))

routeName := types.NamespacedName{Namespace: ns, Name: "no-intersecting-hosts"}
parents := []v1alpha2.RouteParentStatus{{
Expand All @@ -204,7 +204,7 @@ var HTTPRouteHostnameIntersection = suite.ConformanceTest{
},
}}

kubernetes.HTTPRouteMustHaveParents(t, suite.Client, routeName, parents, true, 60)
kubernetes.HTTPRouteMustHaveParents(t, suite.Client, suite.TimeoutConfig, routeName, parents, true)

testCases := []http.ExpectedResponse{
{
Expand All @@ -223,7 +223,7 @@ var HTTPRouteHostnameIntersection = suite.ConformanceTest{
tc := testCases[i]
t.Run(testName(tc, i), func(t *testing.T) {
t.Parallel()
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, gwAddr, tc)
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, gwAddr, tc)
})
}
})
Expand Down
6 changes: 3 additions & 3 deletions conformance/tests/httproute-invalid-backendref-nonexistent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ var HTTPRouteInvalidNonExistentBackendRef = suite.ConformanceTest{
gwNN := types.NamespacedName{Name: "same-namespace", Namespace: "gateway-conformance-infra"}

// Gateway and Route must be Accepted.
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN)
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN)

t.Run("HTTPRoute with only a nonexistent BackendRef has a ResolvedRefs Condition with status False and Reason BackendNotFound", func(t *testing.T) {
resolvedRefsCond := metav1.Condition{
Expand All @@ -50,11 +50,11 @@ var HTTPRouteInvalidNonExistentBackendRef = suite.ConformanceTest{
Reason: string(v1alpha2.RouteReasonBackendNotFound),
}

kubernetes.HTTPRouteMustHaveCondition(t, suite.Client, routeNN, gwNN, resolvedRefsCond, 60)
kubernetes.HTTPRouteMustHaveCondition(t, suite.Client, suite.TimeoutConfig, routeNN, gwNN, resolvedRefsCond)
})

t.Run("HTTP Request to invalid nonexistent backend receive a 500", func(t *testing.T) {
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, gwAddr, http.ExpectedResponse{
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, gwAddr, http.ExpectedResponse{
Request: http.Request{
Method: "GET",
Path: "/",
Expand Down
6 changes: 3 additions & 3 deletions conformance/tests/httproute-invalid-backendref-unknown-kind.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ var HTTPRouteInvalidBackendRefUnknownKind = suite.ConformanceTest{
gwNN := types.NamespacedName{Name: "same-namespace", Namespace: "gateway-conformance-infra"}

// Both the Gateway and the Route are Accepted.
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN)
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN)

// The Route must have a ResolvedRefs Condition with a InvalidKind Reason.
t.Run("HTTPRoute with Invalid Kind has a ResolvedRefs Condition with status False and Reason InvalidKind", func(t *testing.T) {
Expand All @@ -51,11 +51,11 @@ var HTTPRouteInvalidBackendRefUnknownKind = suite.ConformanceTest{
Reason: string(v1alpha2.RouteReasonInvalidKind),
}

kubernetes.HTTPRouteMustHaveCondition(t, suite.Client, routeNN, gwNN, resolvedRefsCond, 60)
kubernetes.HTTPRouteMustHaveCondition(t, suite.Client, suite.TimeoutConfig, routeNN, gwNN, resolvedRefsCond)
})

t.Run("HTTP Request to invalid backend with invalid Kind receives a 500", func(t *testing.T) {
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, gwAddr, http.ExpectedResponse{
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, gwAddr, http.ExpectedResponse{
Request: http.Request{
Method: "GET",
Path: "/v2",
Expand Down
6 changes: 3 additions & 3 deletions conformance/tests/httproute-invalid-cross-namespace-backend-ref.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ var HTTPRouteInvalidCrossNamespaceBackendRef = suite.ConformanceTest{
gwNN := types.NamespacedName{Name: "same-namespace", Namespace: "gateway-conformance-infra"}

// The Route must be Attached.
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN)
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN)

t.Run("HTTPRoute with a cross-namespace BackendRef and no ReferenceGrant has a ResolvedRefs Condition with status False and Reason RefNotPermitted", func(t *testing.T) {

Expand All @@ -54,11 +54,11 @@ var HTTPRouteInvalidCrossNamespaceBackendRef = suite.ConformanceTest{
Reason: string(v1alpha2.RouteReasonRefNotPermitted),
}

kubernetes.HTTPRouteMustHaveCondition(t, suite.Client, routeNN, gwNN, resolvedRefsCond, 60)
kubernetes.HTTPRouteMustHaveCondition(t, suite.Client, suite.TimeoutConfig, routeNN, gwNN, resolvedRefsCond)
})

t.Run("HTTP Request to invalid cross-namespace backend must receive a 500", func(t *testing.T) {
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, gwAddr, http.ExpectedResponse{
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, gwAddr, http.ExpectedResponse{
Request: http.Request{
Method: "GET",
Path: "/",
Expand Down
2 changes: 1 addition & 1 deletion conformance/tests/httproute-invalid-cross-namespace-parent-ref.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ var HTTPRouteInvalidCrossNamespaceParentRef = suite.ConformanceTest{
gwName := types.NamespacedName{Name: "same-namespace", Namespace: "gateway-conformance-infra"}

t.Run("Route should not have Parents set in status", func(t *testing.T) {
kubernetes.HTTPRouteMustHaveNoAcceptedParents(t, suite.Client, routeName, 60)
kubernetes.HTTPRouteMustHaveNoAcceptedParents(t, suite.Client, suite.TimeoutConfig, routeName)
})

t.Run("Gateway should have 0 Routes attached", func(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions conformance/tests/httproute-invalid-reference-grant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ var HTTPRouteInvalidReferenceGrant = suite.ConformanceTest{
gwNN := types.NamespacedName{Name: "same-namespace", Namespace: "gateway-conformance-infra"}

// Route and Gateway must be Attached.
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, s.Client, s.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN)
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, s.Client, s.TimeoutConfig, s.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN)

t.Run("HTTPRoute with BackendRef in another namespace and no ReferenceGrant covering the Service has a ResolvedRefs Condition with status False and Reason RefNotPermitted", func(t *testing.T) {

Expand All @@ -54,11 +54,11 @@ var HTTPRouteInvalidReferenceGrant = suite.ConformanceTest{
Reason: string(v1alpha2.RouteReasonRefNotPermitted),
}

kubernetes.HTTPRouteMustHaveCondition(t, s.Client, routeNN, gwNN, resolvedRefsCond, 60)
kubernetes.HTTPRouteMustHaveCondition(t, s.Client, s.TimeoutConfig, routeNN, gwNN, resolvedRefsCond)
})

t.Run("HTTP Request to invalid backend with missing referenceGrant should receive a 500", func(t *testing.T) {
http.MakeRequestAndExpectEventuallyConsistentResponse(t, s.RoundTripper, gwAddr, http.ExpectedResponse{
http.MakeRequestAndExpectEventuallyConsistentResponse(t, s.RoundTripper, s.TimeoutConfig, gwAddr, http.ExpectedResponse{
Request: http.Request{
Method: "GET",
Path: "/v2",
Expand All @@ -68,7 +68,7 @@ var HTTPRouteInvalidReferenceGrant = suite.ConformanceTest{
})

t.Run("HTTP Request to valid sibling backend should succeed", func(t *testing.T) {
http.MakeRequestAndExpectEventuallyConsistentResponse(t, s.RoundTripper, gwAddr, http.ExpectedResponse{
http.MakeRequestAndExpectEventuallyConsistentResponse(t, s.RoundTripper, s.TimeoutConfig, gwAddr, http.ExpectedResponse{
Request: http.Request{
Method: "GET",
Path: "/",
Expand Down
10 changes: 5 additions & 5 deletions conformance/tests/httproute-listener-hostname-matching.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@ var HTTPRouteListenerHostnameMatching = suite.ConformanceTest{

// This test creates an additional Gateway in the gateway-conformance-infra
// namespace so we have to wait for it to be ready.
kubernetes.NamespacesMustBeReady(t, suite.Client, []string{ns}, 300)
kubernetes.NamespacesMustBeReady(t, suite.Client, suite.TimeoutConfig, []string{ns})

gwNN := types.NamespacedName{Name: "httproute-listener-hostname-matching", Namespace: ns}

_ = kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.ControllerName, kubernetes.NewGatewayRef(gwNN, "listener-1"),
_ = kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN, "listener-1"),
types.NamespacedName{Namespace: ns, Name: "backend-v1"},
)
_ = kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.ControllerName, kubernetes.NewGatewayRef(gwNN, "listener-2"),
_ = kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN, "listener-2"),
types.NamespacedName{Namespace: ns, Name: "backend-v2"},
)
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.ControllerName, kubernetes.NewGatewayRef(gwNN, "listener-3", "listener-4"),
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN, "listener-3", "listener-4"),
types.NamespacedName{Namespace: ns, Name: "backend-v3"},
)

Expand Down Expand Up @@ -91,7 +91,7 @@ var HTTPRouteListenerHostnameMatching = suite.ConformanceTest{
tc := testCases[i]
t.Run(testName(tc, i), func(t *testing.T) {
t.Parallel()
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, gwAddr, tc)
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, gwAddr, tc)
})
}
},
Expand Down
4 changes: 2 additions & 2 deletions conformance/tests/httproute-matching-across-routes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ var HTTPRouteMatchingAcrossRoutes = suite.ConformanceTest{
routeNN1 := types.NamespacedName{Name: "matching-part1", Namespace: ns}
routeNN2 := types.NamespacedName{Name: "matching-part2", Namespace: ns}
gwNN := types.NamespacedName{Name: "same-namespace", Namespace: ns}
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN1, routeNN2)
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN1, routeNN2)

testCases := []http.ExpectedResponse{{
Request: http.Request{
Expand Down Expand Up @@ -109,7 +109,7 @@ var HTTPRouteMatchingAcrossRoutes = suite.ConformanceTest{
tc := testCases[i]
t.Run(testName(tc, i), func(t *testing.T) {
t.Parallel()
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, gwAddr, tc)
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, gwAddr, tc)
})
}
},
Expand Down
4 changes: 2 additions & 2 deletions conformance/tests/httproute-matching.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var HTTPRouteMatching = suite.ConformanceTest{
ns := "gateway-conformance-infra"
routeNN := types.NamespacedName{Name: "matching", Namespace: ns}
gwNN := types.NamespacedName{Name: "same-namespace", Namespace: ns}
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN)
gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN)

testCases := []http.ExpectedResponse{{
Request: http.Request{Path: "/"},
Expand Down Expand Up @@ -72,7 +72,7 @@ var HTTPRouteMatching = suite.ConformanceTest{
tc := testCases[i]
t.Run(testName(tc, i), func(t *testing.T) {
t.Parallel()
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, gwAddr, tc)
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, gwAddr, tc)
})
}
},
Expand Down
4 changes: 2 additions & 2 deletions conformance/tests/httproute-query-param-matching.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ var HTTPRouteQueryParamMatching = suite.ConformanceTest{
ns = "gateway-conformance-infra"
routeNN = types.NamespacedName{Namespace: ns, Name: "query-param-matching"}
gwNN = types.NamespacedName{Namespace: ns, Name: "same-namespace"}
gwAddr = kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN)
gwAddr = kubernetes.GatewayAndHTTPRoutesMustBeReady(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN)
)

testCases := []http.ExpectedResponse{{
Expand Down Expand Up @@ -85,7 +85,7 @@ var HTTPRouteQueryParamMatching = suite.ConformanceTest{
tc := testCases[i]
t.Run(testName(tc, i), func(t *testing.T) {
t.Parallel()
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, gwAddr, tc)
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, gwAddr, tc)
})
}
},
Expand Down
Loading