summaryrefslogtreecommitdiff
path: root/spec/gitlab_shell_discover_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/gitlab_shell_discover_spec.rb')
-rw-r--r--spec/gitlab_shell_discover_spec.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/spec/gitlab_shell_discover_spec.rb b/spec/gitlab_shell_discover_spec.rb
index 225d6b9..fe18b53 100644
--- a/spec/gitlab_shell_discover_spec.rb
+++ b/spec/gitlab_shell_discover_spec.rb
@@ -124,7 +124,12 @@ 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"])
- expect(stderr).to match(/Failed to get username: Internal API error \(500\)/)
+ 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(status).not_to be_success
end
end