Created new function

Signed-off-by: Vaibhav Sharma <17532va@gmail.com>
pull/11701/head
Vaibhav Sharma 1 year ago
parent 58f4561655
commit 6b2fc4d966

@ -50,14 +50,14 @@ import (
// The caller is responsible for stopping the server.
// The temp dir will be removed by testing package automatically when test finished.
func NewTempServerWithCleanup(t *testing.T, glob string) (*Server, error) {
srv, _, err := NewTempServer(glob)
srv, err := NewTempServer(glob)
t.Cleanup(func() { os.RemoveAll(srv.docroot) })
return srv, err
}
// Set up a server with multiple fake repo
func NewTempServerWithCleanupAndMultipleRepos(t *testing.T, glob string) (*Server, error) {
srv, tdir, err := NewTempServer(glob)
srv, tdir, err := NewTempServerWithMultipleRepos(glob)
urls := []string{srv.URL(), "http://foobarbazz:9001"}
if err := setTestingRepositories(urls, filepath.Join(tdir, "repositories.yaml")); err != nil {
panic(err)
@ -263,7 +263,24 @@ func (srv *OCIServer) Run(t *testing.T, opts ...OCIServerOpt) {
// the server.
//
// Deprecated: use NewTempServerWithCleanup
func NewTempServer(glob string) (*Server, string, error) {
func NewTempServer(glob string) (*Server, error) {
tdir, err := ioutil.TempDir("", "helm-repotest-")
if err != nil {
return nil, err
}
srv := NewServer(tdir)
if glob != "" {
if _, err := srv.CopyCharts(glob); err != nil {
srv.Stop()
return srv, err
}
}
return srv, nil
}
func NewTempServerWithMultipleRepos(glob string) (*Server, string, error) {
tdir, err := ioutil.TempDir("", "helm-repotest-")
if err != nil {
return nil, tdir, err

Loading…
Cancel
Save