Commit 8120508c authored by Adam Reese's avatar Adam Reese Committed by GitHub

Merge pull request #1541 from adamreese/fix/lint-errors

fix(*): fix new linter errors
parents 79e43a75 d59f66fc
......@@ -49,6 +49,9 @@ func TestDependencyUpdateCmd(t *testing.T) {
srv := repotest.NewServer(hh)
defer srv.Stop()
copied, err := srv.CopyCharts("testdata/testcharts/*.tgz")
if err != nil {
t.Fatal(err)
}
t.Logf("Copied charts:\n%s", strings.Join(copied, "\n"))
t.Logf("Listening on directory %s", srv.Root())
......
......@@ -32,6 +32,9 @@ func TestRepoRemove(t *testing.T) {
b := bytes.NewBuffer(nil)
home, err := tempHelmHome(t)
if err != nil {
t.Fatal(err)
}
defer os.Remove(home)
hh := helmpath.Home(home)
......
......@@ -72,7 +72,7 @@ func Expand(dir string, r io.Reader) error {
return nil
}
// ExpandFile expands the src file into the dest directroy.
// ExpandFile expands the src file into the dest directory.
func ExpandFile(dest, src string) error {
h, err := os.Open(src)
if err != nil {
......
......@@ -110,6 +110,9 @@ func getAvailablePort() (int, error) {
defer l.Close()
_, p, err := net.SplitHostPort(l.Addr().String())
if err != nil {
return 0, err
}
port, err := strconv.Atoi(p)
if err != nil {
return 0, err
......
......@@ -138,6 +138,9 @@ func validateNoMissingValues(templatesPath string, chartValues chartutil.Values,
tmpl := template.New("tpl").Funcs(engine.FuncMap())
// If the templatesPath includes any *.tpl files we will parse and import them as associated templates
associatedTemplates, err := filepath.Glob(filepath.Join(templatesPath, "*.tpl"))
if err != nil {
return err
}
if len(associatedTemplates) > 0 {
tmpl, err = tmpl.ParseFiles(associatedTemplates...)
......
......@@ -75,7 +75,7 @@ func NewServer(docroot string) *Server {
return srv
}
// Server is an implementaiton of a repository server for testing.
// Server is an implementation of a repository server for testing.
type Server struct {
docroot string
srv *httptest.Server
......
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