Skip to content

Commit 9edec98

Browse files
authored
Increase timeout in ExpectMirroredRequest (#4206)
1 parent a83607f commit 9edec98

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

conformance/tests/httproute-request-mirror.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ var HTTPRouteRequestMirror = suite.ConformanceTest{
105105
t.Run(tc.GetTestCaseName(i), func(t *testing.T) {
106106
t.Parallel()
107107
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, gwAddr, tc)
108-
http.ExpectMirroredRequest(t, suite.Client, suite.Clientset, tc.MirroredTo, tc.Request.Path)
108+
http.ExpectMirroredRequest(t, suite.Client, suite.Clientset, tc.MirroredTo, tc.Request.Path, suite.TimeoutConfig)
109109
})
110110
}
111111
},

conformance/tests/httproute-request-multiple-mirrors.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ var HTTPRouteRequestMultipleMirrors = suite.ConformanceTest{
117117
t.Run(tc.GetTestCaseName(i), func(t *testing.T) {
118118
t.Parallel()
119119
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, gwAddr, tc)
120-
http.ExpectMirroredRequest(t, suite.Client, suite.Clientset, tc.MirroredTo, tc.Request.Path)
120+
http.ExpectMirroredRequest(t, suite.Client, suite.Clientset, tc.MirroredTo, tc.Request.Path, suite.TimeoutConfig)
121121
})
122122
}
123123
},

conformance/utils/http/mirror.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@ import (
2727
clientset "k8s.io/client-go/kubernetes"
2828
"sigs.k8s.io/controller-runtime/pkg/client"
2929

30+
"sigs.k8s.io/gateway-api/conformance/utils/config"
3031
"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
3132
"sigs.k8s.io/gateway-api/conformance/utils/tlog"
3233
)
3334

34-
func ExpectMirroredRequest(t *testing.T, client client.Client, clientset clientset.Interface, mirrorPods []MirroredBackend, path string) {
35+
func ExpectMirroredRequest(t *testing.T, client client.Client, clientset clientset.Interface, mirrorPods []MirroredBackend, path string, timeoutConfig config.TimeoutConfig) {
3536
for i, mirrorPod := range mirrorPods {
3637
if mirrorPod.Name == "" {
3738
tlog.Fatalf(t, "Mirrored BackendRef[%d].Name wasn't provided in the testcase, this test should only check http request mirror.", i)
@@ -64,7 +65,7 @@ func ExpectMirroredRequest(t *testing.T, client client.Client, clientset clients
6465
}
6566
}
6667
return false
67-
}, 60*time.Second, time.Millisecond*100, `Couldn't find mirrored request in "%s/%s" logs`, mirrorPod.Namespace, mirrorPod.Name)
68+
}, timeoutConfig.RequestTimeout, time.Second*1, `Couldn't find mirrored request in "%s/%s" logs`, mirrorPod.Namespace, mirrorPod.Name)
6869
}(mirrorPod)
6970
}
7071

0 commit comments

Comments
 (0)