Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tests: ensure proper garbage collection #489

Merged
merged 1 commit into from
Nov 16, 2021
Merged

tests: ensure proper garbage collection #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions controllers/helmchart_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ var _ = Describe("HelmChartReconciler", func() {
})

AfterEach(func() {
os.RemoveAll(helmServer.Root())
helmServer.Stop()
os.RemoveAll(helmServer.Root())

err = k8sClient.Delete(context.Background(), namespace)
Expect(err).NotTo(HaveOccurred(), "failed to delete test namespace")
Expand Down Expand Up @@ -995,8 +995,8 @@ var _ = Describe("HelmChartReconciler", func() {
gitServer.StopHTTP()
os.RemoveAll(gitServer.Root())

os.RemoveAll(helmServer.Root())
helmServer.Stop()
os.RemoveAll(helmServer.Root())

err = k8sClient.Delete(context.Background(), namespace)
Expect(err).NotTo(HaveOccurred(), "failed to delete test namespace")
Expand Down
7 changes: 1 addition & 6 deletions controllers/helmrepository_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ var _ = Describe("HelmRepositoryReconciler", func() {
})

AfterEach(func() {
os.RemoveAll(helmServer.Root())
helmServer.Stop()
os.RemoveAll(helmServer.Root())

Eventually(func() error {
return k8sClient.Delete(context.Background(), namespace)
Expand Down Expand Up @@ -207,9 +207,6 @@ var _ = Describe("HelmRepositoryReconciler", func() {
})

It("Authenticates when basic auth credentials are provided", func() {
helmServer, err = helmtestserver.NewTempHelmServer()
Expect(err).NotTo(HaveOccurred())

var username, password = "john", "doe"
helmServer.WithMiddleware(func(handler http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
Expand All @@ -221,8 +218,6 @@ var _ = Describe("HelmRepositoryReconciler", func() {
handler.ServeHTTP(w, r)
})
})
defer os.RemoveAll(helmServer.Root())
defer helmServer.Stop()
helmServer.Start()

Expect(helmServer.PackageChart(path.Join("testdata/charts/helmchart"))).Should(Succeed())
Expand Down
20 changes: 15 additions & 5 deletions pkg/git/libgit2/checkout_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ func TestCheckoutBranch_Checkout(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer repo.Free()
defer os.RemoveAll(filepath.Join(repo.Path(), ".."))

firstCommit, err := commitFile(repo, "branch", "init", time.Now())
if err != nil {
Expand Down Expand Up @@ -131,6 +133,8 @@ func TestCheckoutTag_Checkout(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer repo.Free()
defer os.RemoveAll(filepath.Join(repo.Path(), ".."))

var commit *git2go.Commit
if tt.tag != "" {
Expand Down Expand Up @@ -177,7 +181,7 @@ func TestCheckoutCommit_Checkout(t *testing.T) {
t.Fatal(err)
}
defer repo.Free()
defer os.RemoveAll(repo.Path())
defer os.RemoveAll(filepath.Join(repo.Path(), ".."))

c, err := commitFile(repo, "commit", "init", time.Now())
if err != nil {
Expand All @@ -190,7 +194,10 @@ func TestCheckoutCommit_Checkout(t *testing.T) {
commit := CheckoutCommit{
Commit: c.String(),
}
tmpDir, _ := os.MkdirTemp("", "git2go")
tmpDir, err := os.MkdirTemp("", "git2go")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(tmpDir)

cc, err := commit.Checkout(context.TODO(), tmpDir, repo.Path(), nil)
Expand All @@ -203,8 +210,11 @@ func TestCheckoutCommit_Checkout(t *testing.T) {
commit = CheckoutCommit{
Commit: "4dc3185c5fc94eb75048376edeb44571cece25f4",
}
tmpDir2, _ := os.MkdirTemp("", "git2go")
defer os.RemoveAll(tmpDir)
tmpDir2, err := os.MkdirTemp("", "git2go")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(tmpDir2)

cc, err = commit.Checkout(context.TODO(), tmpDir2, repo.Path(), nil)
g.Expect(err).To(HaveOccurred())
Expand Down Expand Up @@ -279,7 +289,7 @@ func TestCheckoutTagSemVer_Checkout(t *testing.T) {
t.Fatal(err)
}
defer repo.Free()
defer os.RemoveAll(repo.Path())
defer os.RemoveAll(filepath.Join(repo.Path(), ".."))

refs := make(map[string]string, len(tags))
for _, tt := range tags {
Expand Down