issue 178: adding required changes to InitGitRepo and CleanupTestRepos

This commit is contained in:
Sebastien Devaux 2019-08-27 21:35:04 +02:00
parent 7e123fbfca
commit ddcbd8d022
2 changed files with 13 additions and 1 deletions

View File

@ -115,7 +115,7 @@ func NewGitRepo(path string, witnesser Witnesser) (*GitRepo, error) {
// InitGitRepo create a new empty git repo at the given path // InitGitRepo create a new empty git repo at the given path
func InitGitRepo(path string) (*GitRepo, error) { func InitGitRepo(path string) (*GitRepo, error) {
repo := &GitRepo{Path: path} repo := &GitRepo{Path: path+"/.git"}
err := repo.createClocks() err := repo.createClocks()
if err != nil { if err != nil {
return nil, err return nil, err

View File

@ -1,6 +1,7 @@
package repository package repository
import ( import (
"strings"
"io/ioutil" "io/ioutil"
"log" "log"
"os" "os"
@ -44,6 +45,17 @@ func CleanupTestRepos(t testing.TB, repos ...Repo) {
var firstErr error var firstErr error
for _, repo := range repos { for _, repo := range repos {
path := repo.GetPath() path := repo.GetPath()
if (strings.HasSuffix(path,"/.git")) {
// non bare repository, remove complete repos not
// only git meta data.
path=strings.TrimSuffix(path,"/.git");
// Testing non bare repo should also check path is
// only .git (i.e. ./.git), but doing so, we should
// try to remove the current directory and hav some
// trouble. In the present case, this case should not
// occure.
// TODO consider warning or error when path == ".git"
}
// fmt.Println("Cleaning repo:", path) // fmt.Println("Cleaning repo:", path)
err := os.RemoveAll(path) err := os.RemoveAll(path)
if err != nil { if err != nil {