diff --git a/cmd/helm/repo_add_test.go b/cmd/helm/repo_add_test.go index 7443a476a..27ae24113 100644 --- a/cmd/helm/repo_add_test.go +++ b/cmd/helm/repo_add_test.go @@ -20,15 +20,12 @@ import ( "fmt" "io" "os" - "os/exec" - "strings" "sync" "testing" "github.com/spf13/cobra" "k8s.io/helm/pkg/helm" - "k8s.io/helm/pkg/helm/helmpath" "k8s.io/helm/pkg/repo" "k8s.io/helm/pkg/repo/repotest" ) @@ -149,68 +146,3 @@ func TestRepoAddConcurrentGoRoutines(t *testing.T) { } } } - -// Same as TestRepoAddConcurrentGoRoutines but with repository additions in sub-processes -func TestRepoAddConcurrentSubProcesses(t *testing.T) { - goWantHelperProcess := os.Getenv("GO_WANT_HELPER_PROCESS") - if goWantHelperProcess == "" { - // parent - - ts, thome, err := repotest.NewTempServer("testdata/testserver/*.*") - if err != nil { - t.Fatal(err) - } - - settings.Home = thome - - cleanup := resetEnv() - defer func() { - ts.Stop() - os.RemoveAll(thome.String()) - cleanup() - }() - if err := ensureTestHome(settings.Home, t); err != nil { - t.Fatal(err) - } - - var wg sync.WaitGroup - wg.Add(2) - for i := 0; i < 2; i++ { - go func(name string) { - defer wg.Done() - - cmd := exec.Command(os.Args[0], "-test.run=^TestRepoAddConcurrentSubProcesses$") - cmd.Env = append(os.Environ(), fmt.Sprintf("GO_WANT_HELPER_PROCESS=%s,%s", name, ts.URL()), fmt.Sprintf("HELM_HOME=%s", settings.Home)) - out, err := cmd.CombinedOutput() - if len(out) > 0 || err != nil { - t.Fatalf("child process: %q, %v", out, err) - } - }(fmt.Sprintf("%s-%d", testName, i)) - } - wg.Wait() - - f, err := repo.LoadRepositoriesFile(settings.Home.RepositoryFile()) - if err != nil { - t.Error(err) - } - - var name string - for i := 0; i < 2; i++ { - name = fmt.Sprintf("%s-%d", testName, i) - if !f.Has(name) { - t.Errorf("%s was not successfully inserted into %s", name, settings.Home.RepositoryFile()) - } - } - } else { - // child - s := strings.Split(goWantHelperProcess, ",") - settings.Home = helmpath.Home(os.Getenv("HELM_HOME")) - repoName := s[0] - tsURL := s[1] - if err := addRepository(repoName, tsURL, "", "", settings.Home, "", "", "", true); err != nil { - t.Fatal(err) - } - - os.Exit(0) - } -}