diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-06 18:14:39 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-06 18:14:39 +0300 |
| commit | 55242833f832095a6fcff00b1ccacbc5900ee52a (patch) | |
| tree | 6e17b16638e60099533473b540fe8f635d2f25da /workhorse/internal/api | |
| parent | 7c31b0312ba0eae4e4ebe54125b13aa2ae5f5db4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse/internal/api')
| -rw-r--r-- | workhorse/internal/api/api_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/workhorse/internal/api/api_test.go b/workhorse/internal/api/api_test.go index 43e3604cc9c..b82bb55fb85 100644 --- a/workhorse/internal/api/api_test.go +++ b/workhorse/internal/api/api_test.go @@ -49,7 +49,7 @@ func getGeoProxyURLGivenResponse(t *testing.T, givenInternalApiResponse string) } func testRailsServer(url *regexp.Regexp, code int, body string) *httptest.Server { - return testhelper.TestServerWithHandler(url, func(w http.ResponseWriter, r *http.Request) { + return testhelper.TestServerWithHandlerWithGeoPolling(url, func(w http.ResponseWriter, r *http.Request) { // return a 204 No Content response if we don't receive the JWT header if r.Header.Get(secret.RequestHeader) == "" { w.WriteHeader(204) |