Skip to content
Snippets Groups Projects
Commit 5f742eb9 authored by Grzegorz Bizon's avatar Grzegorz Bizon
Browse files

Merge branch 'timeouted' into 'master'

correct error message on helm tiller installation timeout

See merge request gitlab-org/gitlab-ce!20683
parents 71384c59 bec319f8
No related branches found
No related tags found
1 merge request!10495Merge Requests - Assignee
Loading
Loading
@@ -35,7 +35,7 @@ module Clusters
def check_timeout
if timeouted?
begin
app.make_errored!('Installation timeouted')
app.make_errored!('Installation timed out')
ensure
remove_installation_pod
end
Loading
Loading
Loading
Loading
@@ -43,7 +43,7 @@ describe Clusters::Applications::CheckInstallationProgressService do
service.execute
 
expect(application).to be_errored
expect(application.status_reason).to match(/\btimeouted\b/)
expect(application.status_reason).to match(/\btimed out\b/)
end
end
end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment