Unverified Commit 465f56f8 authored by Matthew Fisher's avatar Matthew Fisher Committed by GitHub

Merge pull request #5468 from Keramblock/master

fix(tiller): fixed a typo in tiller and unit test
parents 744cd20e 63ef73d4
...@@ -195,7 +195,7 @@ func (s *ReleaseServer) uniqName(start string, reuse bool) (string, error) { ...@@ -195,7 +195,7 @@ func (s *ReleaseServer) uniqName(start string, reuse bool) (string, error) {
s.Log("name %s exists but is not in use, reusing name", start) s.Log("name %s exists but is not in use, reusing name", start)
return start, nil return start, nil
} else if reuse { } else if reuse {
return "", fmt.Errorf("a released named %s is in use, cannot re-use a name that is still in use", start) return "", fmt.Errorf("a release named %s is in use, cannot re-use a name that is still in use", start)
} }
return "", fmt.Errorf("a release named %s already exists.\nRun: helm ls --all %s; to check the status of the release\nOr run: helm del --purge %s; to delete it", start, start, start) return "", fmt.Errorf("a release named %s already exists.\nRun: helm ls --all %s; to check the status of the release\nOr run: helm del --purge %s; to delete it", start, start, start)
......
...@@ -604,7 +604,7 @@ func TestUpdateReleasePendingInstall_Force(t *testing.T) { ...@@ -604,7 +604,7 @@ func TestUpdateReleasePendingInstall_Force(t *testing.T) {
t.Error("Expected failed update") t.Error("Expected failed update")
} }
expectedError := "a released named forceful-luke is in use, cannot re-use a name that is still in use" expectedError := "a release named forceful-luke is in use, cannot re-use a name that is still in use"
got := err.Error() got := err.Error()
if err.Error() != expectedError { if err.Error() != expectedError {
t.Errorf("Expected error %q, got %q", expectedError, got) t.Errorf("Expected error %q, got %q", expectedError, got)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment