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 /spec/gitlab_shell_discover_spec.rb | |
| 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 'spec/gitlab_shell_discover_spec.rb')
| -rw-r--r-- | spec/gitlab_shell_discover_spec.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/spec/gitlab_shell_discover_spec.rb b/spec/gitlab_shell_discover_spec.rb index fe18b53..07a9be1 100644 --- a/spec/gitlab_shell_discover_spec.rb +++ b/spec/gitlab_shell_discover_spec.rb @@ -124,12 +124,7 @@ describe 'bin/gitlab-shell' do it 'returns an error message when the API call fails without a message' do _, stderr, status = run!(["-c/usr/share/webapps/gitlab-shell/bin/gitlab-shell", "username-broken"]) - stderr_output = if ENV['FF_GITLAB_SHELL_RETRYABLE_HTTP'] == '1' - /Failed to get username: Internal API unreachable/ - else - /Failed to get username: Internal API error \(500\)/ - end - expect(stderr).to match(stderr_output) + expect(stderr).to match(/Failed to get username: Internal API unreachable/) expect(status).not_to be_success end end |