rms/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2026-05-17 08:36:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

lib/httpserver: fixes tests after 686c9a21ff

Browse Source
This commit is contained in:
f41gh7
2026-03-05 16:12:29 +01:00
parent 686c9a21ff
commit b3f57c113b
1 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/httpserver/httpserver_test.go
View File

@@ -150,8 +150,8 @@ func TestHandlerWrapperOptionsRequest(t *testing.T) {
handlerCalled = true
return true
}
f := func(t *testing.T, name string, corsDisabled bool, expectAllowOrigin bool) {
headersToCheck := []string{"Access-Control-Allow-Origin", "Access-Control-Allow-Headers"}
f := func(t *testing.T, corsDisabled bool) {
t.Helper()
handlerCalled = false
@@ -161,6 +161,10 @@ func TestHandlerWrapperOptionsRequest(t *testing.T) {
*disableCORS = origDisableCORS
}()
wantCORSHeaderValue := "*"
if corsDisabled {
wantCORSHeaderValue = ""
}
req := httptest.NewRequest(http.MethodOptions, "/api/v1/query_range", nil)
w := httptest.NewRecorder()
@@ -170,31 +174,23 @@ func TestHandlerWrapperOptionsRequest(t *testing.T) {
_ = res.Body.Close()
if res.StatusCode != http.StatusNoContent {
t.Fatalf("%s: unexpected status code; got %d; want %d", name, res.StatusCode, http.StatusNoContent)
t.Fatalf("unexpected status code; (-%d;+%d)", http.StatusNoContent, res.StatusCode)
}
if handlerCalled {
t.Fatalf("%s: request handler must not be called for OPTIONS requests", name)
t.Fatalf("request handler must not be called for OPTIONS requests")
}
if got := res.Header.Get("Access-Control-Allow-Methods"); got != "*" {
t.Fatalf("%s: unexpected Access-Control-Allow-Methods; got %q; want %q", name, got, "*")
}
wantHeaders := "*"
if got := res.Header.Get("Access-Control-Allow-Headers"); got != wantHeaders {
t.Fatalf("%s: unexpected Access-Control-Allow-Headers; got %q; want %q", name, got, wantHeaders)
}
if expectAllowOrigin {
if got := res.Header.Get("Access-Control-Allow-Origin"); got != "*" {
t.Fatalf("%s: unexpected Access-Control-Allow-Origin; got %q; want %q", name, got, "*")
}
} else {
if got := res.Header.Get("Access-Control-Allow-Origin"); got != "" {
t.Fatalf("%s: Access-Control-Allow-Origin must be empty when CORS is disabled; got %q", name, got)
for _, h := range headersToCheck {
got := res.Header.Get(h)
if wantCORSHeaderValue != got {
t.Fatalf("unexpected header: %s value: (-%s;+%s)", h, wantCORSHeaderValue, got)
}
}
}
f(t, "cors enabled", false, true)
f(t, "cors disabled", true, false)
// CORS disabled
f(t, false)
// CORS enabled
f(t, true)
}
func TestHandlerWrapper(t *testing.T) {