Signed-off-by: Vaibhav Sharma <17532va@gmail.com>
pull/11701/head
Vaibhav Sharma 3 years ago
parent c336914b4b
commit 5baebe19a7

@ -660,10 +660,10 @@ func (m *Manager) UpdateRepositories(c *chart.Chart) error {
repos = append(repos, e) repos = append(repos, e)
} }
} }
if len(rf.Repositories) > 0 { if len(repos) > 0 {
fmt.Fprintln(m.Out, "Hang tight while we grab the latest from your chart repositories...") fmt.Fprintln(m.Out, "Hang tight while we grab the latest from your chart repositories...")
// This prints warnings straight to out. // This prints warnings straight to out.
if err := m.parallelRepoUpdate(rf.Repositories); err != nil { if err := m.parallelRepoUpdate(repos); err != nil {
return err return err
} }
fmt.Fprintln(m.Out, "Update Complete. ⎈Happy Helming!⎈") fmt.Fprintln(m.Out, "Update Complete. ⎈Happy Helming!⎈")

@ -576,8 +576,7 @@ func TestKey(t *testing.T) {
// See issue https://github.com/helm/helm/issues/11509 // See issue https://github.com/helm/helm/issues/11509
func TestUpdateOnlyRequiredRepos(t *testing.T) { func TestUpdateOnlyRequiredRepos(t *testing.T) {
// Set up a fake repo // Set up a fake repo
srv, err := repotest.NewTempServerWithCleanupAndMultipleRepos(t, "testdata/*.tgz*", []string{"https://abc", "https://xyz"}) srv, err := repotest.NewTempServerWithCleanup(t, "testdata/*.tgz*")
//srv, err := repotest.NewTempServerWithCleanup(t, "testdata/*.tgz*")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -590,17 +589,6 @@ func TestUpdateOnlyRequiredRepos(t *testing.T) {
return filepath.Join(append([]string{srv.Root()}, p...)...) return filepath.Join(append([]string{srv.Root()}, p...)...)
} }
// Save dep
d := &chart.Chart{
Metadata: &chart.Metadata{
Name: "dep-chart",
Version: "0.1.0",
APIVersion: "v1",
},
}
if err := chartutil.SaveDir(d, dir()); err != nil {
t.Fatal(err)
}
// Save a chart // Save a chart
c := &chart.Chart{ c := &chart.Chart{
Metadata: &chart.Metadata{ Metadata: &chart.Metadata{
@ -608,9 +596,9 @@ func TestUpdateOnlyRequiredRepos(t *testing.T) {
Version: "0.1.0", Version: "0.1.0",
APIVersion: "v2", APIVersion: "v2",
Dependencies: []*chart.Dependency{{ Dependencies: []*chart.Dependency{{
Name: d.Metadata.Name, Name: "local-subchart",
Version: ">=0.1.0", Version: ">=0.1.0",
Repository: "https://abc", Repository: srv.URL(),
}}, }},
}, },
} }

@ -55,20 +55,6 @@ func NewTempServerWithCleanup(t *testing.T, glob string) (*Server, error) {
return srv, err return srv, err
} }
// Setup mutliple fake repos
func NewTempServerWithCleanupAndMultipleRepos(t *testing.T, glob string, repoUrls []string) (*Server, error) {
srv, err := NewTempServer(glob)
srv.Stop()
// Add the testing repository as the only repo.
if err := setTestingRepositories(repoUrls, filepath.Join(srv.docroot, "repositories.yaml")); err != nil {
panic(err)
}
srv.CopyCharts()
srv.Start()
t.Cleanup(func() { os.RemoveAll(srv.docroot) })
return srv, err
}
// Set up a fake repo with basic auth enabled // Set up a fake repo with basic auth enabled
func NewTempServerWithCleanupAndBasicAuth(t *testing.T, glob string) *Server { func NewTempServerWithCleanupAndBasicAuth(t *testing.T, glob string) *Server {
srv, err := NewTempServerWithCleanup(t, glob) srv, err := NewTempServerWithCleanup(t, glob)

Loading…
Cancel
Save