Commit e28e2419 authored by fibonacci1729's avatar fibonacci1729

fix(tiller): re-enable skipped test, golint, & gofmt all the things

parent 79e57720
...@@ -225,10 +225,10 @@ func (s *releaseServer) GetReleaseContent(c ctx.Context, req *services.GetReleas ...@@ -225,10 +225,10 @@ func (s *releaseServer) GetReleaseContent(c ctx.Context, req *services.GetReleas
if req.Version <= 0 { if req.Version <= 0 {
rel, err := s.env.Releases.Deployed(req.Name) rel, err := s.env.Releases.Deployed(req.Name)
return &services.GetReleaseContentResponse{Release: rel}, err return &services.GetReleaseContentResponse{Release: rel}, err
} else {
rel, err := s.env.Releases.Get(req.Name, req.Version)
return &services.GetReleaseContentResponse{Release: rel}, err
} }
rel, err := s.env.Releases.Get(req.Name, req.Version)
return &services.GetReleaseContentResponse{Release: rel}, err
} }
func (s *releaseServer) UpdateRelease(c ctx.Context, req *services.UpdateReleaseRequest) (*services.UpdateReleaseResponse, error) { func (s *releaseServer) UpdateRelease(c ctx.Context, req *services.UpdateReleaseRequest) (*services.UpdateReleaseResponse, error) {
......
...@@ -646,8 +646,6 @@ func TestUninstallPurgeRelease(t *testing.T) { ...@@ -646,8 +646,6 @@ func TestUninstallPurgeRelease(t *testing.T) {
} }
func TestUninstallPurgeDeleteRelease(t *testing.T) { func TestUninstallPurgeDeleteRelease(t *testing.T) {
t.Skip("TestUninstallPurgeDeleteRelease")
c := context.Background() c := context.Background()
rs := rsFixture() rs := rsFixture()
rs.env.Releases.Create(releaseStub()) rs.env.Releases.Create(releaseStub())
...@@ -667,7 +665,7 @@ func TestUninstallPurgeDeleteRelease(t *testing.T) { ...@@ -667,7 +665,7 @@ func TestUninstallPurgeDeleteRelease(t *testing.T) {
} }
_, err2 := rs.UninstallRelease(c, req2) _, err2 := rs.UninstallRelease(c, req2)
if err2 != nil { if err2 != nil && err2.Error() != "'angry-panda' has no deployed releases" {
t.Errorf("Failed uninstall: %s", err2) t.Errorf("Failed uninstall: %s", err2)
} }
} }
......
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