test: clean up temp dir and repo correctly

This commit is contained in:
Steve Moyer 2022-05-28 08:07:34 -04:00 committed by Michael Muré
parent 8821b67d1b
commit 86dd450aaf
No known key found for this signature in database
GPG Key ID: A4457C029293126F
2 changed files with 19 additions and 5 deletions

View File

@ -344,7 +344,9 @@ func Example_entity() {
repoRenePath, _ := os.MkdirTemp("", "")
repoIsaacPath, _ := os.MkdirTemp("", "")
repoRene, _ := repository.InitGoGitRepo(repoRenePath, gitBugNamespace)
defer repoRene.Close()
repoIsaac, _ := repository.InitGoGitRepo(repoIsaacPath, gitBugNamespace)
defer repoIsaac.Close()
_ = repoRene.AddRemote("origin", repoIsaacPath)
_ = repoIsaac.AddRemote("origin", repoRenePath)

View File

@ -15,19 +15,25 @@ func TestNewGoGitRepo(t *testing.T) {
// Plain
plainRoot, err := ioutil.TempDir("", "")
require.NoError(t, err)
defer os.RemoveAll(plainRoot)
t.Cleanup(func() {
require.NoError(t, os.RemoveAll(plainRoot))
})
_, err = InitGoGitRepo(plainRoot, namespace)
plainRepo, err := InitGoGitRepo(plainRoot, namespace)
require.NoError(t, err)
require.NoError(t, plainRepo.Close())
plainGitDir := filepath.Join(plainRoot, ".git")
// Bare
bareRoot, err := ioutil.TempDir("", "")
require.NoError(t, err)
defer os.RemoveAll(bareRoot)
t.Cleanup(func() {
require.NoError(t, os.RemoveAll(bareRoot))
})
_, err = InitBareGoGitRepo(bareRoot, namespace)
bareRepo, err := InitBareGoGitRepo(bareRoot, namespace)
require.NoError(t, err)
require.NoError(t, bareRepo.Close())
bareGitDir := bareRoot
tests := []struct {
@ -59,6 +65,7 @@ func TestNewGoGitRepo(t *testing.T) {
} else {
require.NoError(t, err, i)
assert.Equal(t, filepath.ToSlash(tc.outPath), filepath.ToSlash(r.path), i)
require.NoError(t, r.Close())
}
}
}
@ -72,10 +79,15 @@ func TestGoGitRepo_Indexes(t *testing.T) {
plainRoot, err := ioutil.TempDir("", "")
require.NoError(t, err)
// defer os.RemoveAll(plainRoot)
t.Cleanup(func() {
require.NoError(t, os.RemoveAll(plainRoot))
})
repo, err := InitGoGitRepo(plainRoot, namespace)
require.NoError(t, err)
t.Cleanup(func() {
require.NoError(t, repo.Close())
})
// Can create indices
indexA, err := repo.GetBleveIndex("a")