From 7be07e26680e6e162e4d8ddbad52f106eb46da2b Mon Sep 17 00:00:00 2001 From: Alex Ellis Date: Wed, 5 Jun 2019 18:28:26 +0100 Subject: [PATCH] Fix broken test Signed-off-by: Alex Ellis --- gateway/handlers/external_auth_test.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gateway/handlers/external_auth_test.go b/gateway/handlers/external_auth_test.go index f3337723..43688529 100644 --- a/gateway/handlers/external_auth_test.go +++ b/gateway/handlers/external_auth_test.go @@ -53,12 +53,11 @@ func Test_External_Auth_Wrapper_PassesValidAuth(t *testing.T) { } } -// Test_External_Auth_Wrapper_PassesValidAuthButOnly200IsValid this test exists -// to document the TODO action to consider all "2xx" statuses as valid. -func Test_External_Auth_Wrapper_PassesValidAuthButOnly200IsValid(t *testing.T) { +func Test_External_Auth_Wrapper_TimeoutGivesInternalServerError(t *testing.T) { s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - w.WriteHeader(http.StatusAccepted) + time.Sleep(50 * time.Millisecond) + w.WriteHeader(http.StatusOK) })) defer s.Close() @@ -67,22 +66,24 @@ func Test_External_Auth_Wrapper_PassesValidAuthButOnly200IsValid(t *testing.T) { } passBody := false - handler := MakeExternalAuthHandler(next, time.Second*5, s.URL, passBody) + handler := MakeExternalAuthHandler(next, time.Millisecond*10, s.URL, passBody) req := httptest.NewRequest(http.MethodGet, s.URL, nil) rr := httptest.NewRecorder() handler(rr, req) - want := http.StatusUnauthorized + + want := http.StatusInternalServerError if rr.Code != want { t.Errorf("Status incorrect, want: %d, but got %d", want, rr.Code) } } -// func Test_External_Auth_Wrapper_TimeoutGivesInternalServerError(t *testing.T) { +// // Test_External_Auth_Wrapper_PassesValidAuthButOnly200IsValid this test exists +// // to document the TODO action to consider all "2xx" statuses as valid. +// func Test_External_Auth_Wrapper_PassesValidAuthButOnly200IsValid(t *testing.T) { // s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { -// time.Sleep(50 * time.Millisecond) -// w.WriteHeader(http.StatusOK) +// w.WriteHeader(http.StatusAccepted) // })) // defer s.Close() @@ -91,13 +92,12 @@ func Test_External_Auth_Wrapper_PassesValidAuthButOnly200IsValid(t *testing.T) { // } // passBody := false -// handler := MakeExternalAuthHandler(next, time.Millisecond*10, s.URL, passBody) +// handler := MakeExternalAuthHandler(next, time.Second*5, s.URL, passBody) // req := httptest.NewRequest(http.MethodGet, s.URL, nil) // rr := httptest.NewRecorder() // handler(rr, req) - -// want := http.StatusInternalServerError +// want := http.StatusUnauthorized // if rr.Code != want { // t.Errorf("Status incorrect, want: %d, but got %d", want, rr.Code) // }