Skip to content

K
k3s
Unverified Commit b5387eff authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #58867 from hzxuzhonghu/fix-cors-test-bug

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix using defer in loop in cors test **What this PR does / why we need it**: fix bug in cors test **Special notes for your reviewer**: a small bug fix, wrap defer in a closure **Release note**: ```release-note NONE ```
parents ee8c8967 b835c46c
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 29 deletions
staging/src/k8s.io/apiserver/pkg/server/filters/cors_test.go
View file @ b5387eff
...@@ -42,21 +42,22 @@ func TestCORSAllowedOrigins(t *testing.T) { ...@@ -42,21 +42,22 @@ func TestCORSAllowedOrigins(t *testing.T) {
http.HandlerFunc(func(http.ResponseWriter, *http.Request) {}), http.HandlerFunc(func(http.ResponseWriter, *http.Request) {}),
item.allowedOrigins, nil, nil, nil, "true", item.allowedOrigins, nil, nil, nil, "true",
) )
server := httptest.NewServer(handler) var response *http.Response
defer server.Close() func() {
client := http.Client{} server := httptest.NewServer(handler)
defer server.Close()
request, err := http.NewRequest("GET", server.URL+"/version", nil)
if err != nil { request, err := http.NewRequest("GET", server.URL+"/version", nil)
t.Errorf("unexpected error: %v", err) if err != nil {
} t.Errorf("unexpected error: %v", err)
request.Header.Set("Origin", item.origin) }
request.Header.Set("Origin", item.origin)
response, err := client.Do(request) client := http.Client{}
if err != nil { response, err = client.Do(request)
t.Errorf("unexpected error: %v", err) if err != nil {
} t.Errorf("unexpected error: %v", err)
}
}()
if item.allowed { if item.allowed {
if !reflect.DeepEqual(item.origin, response.Header.Get("Access-Control-Allow-Origin")) { if !reflect.DeepEqual(item.origin, response.Header.Get("Access-Control-Allow-Origin")) {
t.Errorf("Expected %#v, Got %#v", item.origin, response.Header.Get("Access-Control-Allow-Origin")) t.Errorf("Expected %#v, Got %#v", item.origin, response.Header.Get("Access-Control-Allow-Origin"))
...@@ -131,20 +132,22 @@ func TestCORSAllowedMethods(t *testing.T) { ...@@ -131,20 +132,22 @@ func TestCORSAllowedMethods(t *testing.T) {
http.HandlerFunc(func(http.ResponseWriter, *http.Request) {}), http.HandlerFunc(func(http.ResponseWriter, *http.Request) {}),
[]string{".*"}, test.allowedMethods, nil, nil, "true", []string{".*"}, test.allowedMethods, nil, nil, "true",
) )
server := httptest.NewServer(handler) var response *http.Response
defer server.Close() func() {
client := http.Client{} server := httptest.NewServer(handler)
defer server.Close()
request, err := http.NewRequest(test.method, server.URL+"/version", nil)
if err != nil { request, err := http.NewRequest(test.method, server.URL+"/version", nil)
t.Fatalf("unexpected error: %v", err) if err != nil {
} t.Fatalf("unexpected error: %v", err)
request.Header.Set("Origin", "allowed.com") }
request.Header.Set("Origin", "allowed.com")
response, err := client.Do(request) client := http.Client{}
if err != nil { response, err = client.Do(request)
t.Fatalf("unexpected error: %v", err) if err != nil {
} t.Fatalf("unexpected error: %v", err)
}
}()
methodAllowed := allowsMethod(response, test.method) methodAllowed := allowsMethod(response, test.method)
switch { switch {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment