Merge pull request #6108 from hickeyma/fix-test-lint

Fix(lint): Style conformance issues
pull/6118/head
Martin Hickey 5 years ago committed by GitHub
commit b02cb4fc66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -20,14 +20,14 @@ import (
"fmt"
"io"
"github.com/spf13/cobra"
"github.com/gosuri/uitable"
"github.com/spf13/cobra"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
"helm.sh/helm/pkg/releaseutil"
"helm.sh/helm/pkg/chart"
"helm.sh/helm/pkg/release"
"helm.sh/helm/pkg/releaseutil"
)
var historyHelp = `
@ -132,7 +132,6 @@ func getHistory(client *action.History, name string) (string, error) {
return string(history), nil
}
func getReleaseHistory(rls []*release.Release) (history releaseHistory) {
for i := len(rls) - 1; i >= 0; i-- {
r := rls[i]
@ -182,4 +181,4 @@ func min(x, y int) int {
return x
}
return y
}
}

@ -125,12 +125,12 @@ func (u *Uninstall) Run(name string) (*release.UninstallReleaseResponse, error)
if err != nil {
errs = append(errs, errors.Wrap(err, "uninstall: Failed to purge the release"))
}
// Return the errors that occurred while deleting the release, if any
if len(errs) > 0 {
return res, errors.Errorf("uninstallation completed with %d error(s): %s", len(errs), joinErrors(errs))
}
return res, nil
}

@ -32,14 +32,14 @@ import (
// delegates all its calls to `PrintingKubeClient`
type FailingKubeClient struct {
PrintingKubeClient
CreateError error
WaitError error
GetError error
DeleteError error
WatchUntilReadyError error
UpdateError error
BuildError error
BuildUnstructuredError error
CreateError error
WaitError error
GetError error
DeleteError error
WatchUntilReadyError error
UpdateError error
BuildError error
BuildUnstructuredError error
WaitAndGetCompletedPodPhaseError error
}
@ -113,4 +113,4 @@ func (f *FailingKubeClient) WaitAndGetCompletedPodPhase(s string, d time.Duratio
return v1.PodSucceeded, f.WaitAndGetCompletedPodPhaseError
}
return f.PrintingKubeClient.WaitAndGetCompletedPodPhase(s, d)
}
}

Loading…
Cancel
Save