diff options
author | Ash McKenzie <amckenzie@gitlab.com> | 2023-01-31 02:20:37 +0000 |
---|---|---|
committer | Ash McKenzie <amckenzie@gitlab.com> | 2023-01-31 02:20:37 +0000 |
commit | a2232e3809cba93ee8205c734ea7a9f779a7216e (patch) | |
tree | d96c92030bfe86a5183a7268361b2ec70788f73c /internal/command/discover/discover_test.go | |
parent | 51eab44edafd0c097e82c1a74fd379cae4869a42 (diff) | |
parent | 80f684e48eca2bf1ef2006d84f8c49bec7104344 (diff) | |
download | gitlab-shell-a2232e3809cba93ee8205c734ea7a9f779a7216e.tar.gz |
Merge branch 'feat/remove-unretryable-http' into 'main'
feat: make retryable http default client
See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/710
Merged-by: Ash McKenzie <amckenzie@gitlab.com>
Approved-by: Oscar Tovar <otovar@gitlab.com>
Approved-by: Ash McKenzie <amckenzie@gitlab.com>
Co-authored-by: Steve Azzopardi <sazzopardi@gitlab.com>
Diffstat (limited to 'internal/command/discover/discover_test.go')
-rw-r--r-- | internal/command/discover/discover_test.go | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/internal/command/discover/discover_test.go b/internal/command/discover/discover_test.go index ccbfa7e..df9ca47 100644 --- a/internal/command/discover/discover_test.go +++ b/internal/command/discover/discover_test.go @@ -16,33 +16,31 @@ import ( "gitlab.com/gitlab-org/gitlab-shell/v14/internal/config" ) -var ( - requests = []testserver.TestRequestHandler{ - { - Path: "/api/v4/internal/discover", - Handler: func(w http.ResponseWriter, r *http.Request) { - if r.URL.Query().Get("key_id") == "1" || r.URL.Query().Get("username") == "alex-doe" { - body := map[string]interface{}{ - "id": 2, - "username": "alex-doe", - "name": "Alex Doe", - } - json.NewEncoder(w).Encode(body) - } else if r.URL.Query().Get("username") == "broken_message" { - body := map[string]string{ - "message": "Forbidden!", - } - w.WriteHeader(http.StatusForbidden) - json.NewEncoder(w).Encode(body) - } else if r.URL.Query().Get("username") == "broken" { - w.WriteHeader(http.StatusInternalServerError) - } else { - fmt.Fprint(w, "null") +var requests = []testserver.TestRequestHandler{ + { + Path: "/api/v4/internal/discover", + Handler: func(w http.ResponseWriter, r *http.Request) { + if r.URL.Query().Get("key_id") == "1" || r.URL.Query().Get("username") == "alex-doe" { + body := map[string]interface{}{ + "id": 2, + "username": "alex-doe", + "name": "Alex Doe", + } + json.NewEncoder(w).Encode(body) + } else if r.URL.Query().Get("username") == "broken_message" { + body := map[string]string{ + "message": "Forbidden!", } - }, + w.WriteHeader(http.StatusForbidden) + json.NewEncoder(w).Encode(body) + } else if r.URL.Query().Get("username") == "broken" { + w.WriteHeader(http.StatusInternalServerError) + } else { + fmt.Fprint(w, "null") + } }, - } -) + }, +} func TestExecute(t *testing.T) { url := testserver.StartSocketHttpServer(t, requests) @@ -112,7 +110,7 @@ func TestFailingExecute(t *testing.T) { { desc: "When the API fails", arguments: &commandargs.Shell{GitlabUsername: "broken"}, - expectedError: "Failed to get username: Internal API error (500)", + expectedError: "Failed to get username: Internal API unreachable", }, } |