function: fix commit_file_stats_test.go

Signed-off-by: Javi Fontan <[email protected]>

Author: jfontan

internal/function/commit_file_stats_test.go

@@ -10,20 +10,11 @@ import (
 
 	"github.com/src-d/go-mysql-server/sql"
 	"github.com/src-d/go-mysql-server/sql/expression"
-	fixtures "gopkg.in/src-d/go-git-fixtures.v3"
-	"gopkg.in/src-d/go-git.v4/plumbing/cache"
 )
 
 func TestCommitFileStats(t *testing.T) {
-	require.NoError(t, fixtures.Init())
-	defer func() {
-		require.NoError(t, fixtures.Clean())
-	}()
-
-	path := fixtures.ByTag("worktree").One().Worktree().Root()
-
-	pool := gitbase.NewRepositoryPool(cache.DefaultMaxSize)
-	require.NoError(t, pool.AddGitWithID("worktree", path))
+	pool, cleanup := setupPool(t)
+	defer cleanup()
 
 	session := gitbase.NewSession(pool)
 	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))

internal/function/commit_stats_test.go

@@ -19,30 +19,8 @@ import (
 )
 
 func TestCommitStatsEval(t *testing.T) {
-	require.NoError(t, fixtures.Init())
-	defer func() {
-		require.NoError(t, fixtures.Clean())
-	}()
-
-	path := fixtures.ByTag("worktree").One().Worktree().Root()
-	pathLib := path + "-lib"
-	pathRepo := filepath.Join(pathLib, "worktree")
-
-	err := os.MkdirAll(pathLib, 0777)
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, os.RemoveAll(pathLib))
-	}()
-
-	err = os.Rename(path, pathRepo)
-	require.NoError(t, err)
-
-	lib := plain.NewLibrary("plain")
-	loc, err := plain.NewLocation("location", osfs.New(pathLib), nil)
-	require.NoError(t, err)
-	lib.AddLocation(loc)
-
-	pool := gitbase.NewRepositoryPool(cache.DefaultMaxSize, lib)
+	pool, cleanup := setupPool(t)
+	defer cleanup()
 
 	session := gitbase.NewSession(pool)
 	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
@@ -105,3 +83,32 @@ func TestCommitStatsEval(t *testing.T) {
 		})
 	}
 }
+
+func setupPool(t *testing.T) (*gitbase.RepositoryPool, func()) {
+	t.Helper()
+	require.NoError(t, fixtures.Init())
+
+	path := fixtures.ByTag("worktree").One().Worktree().Root()
+	pathLib := path + "-lib"
+	pathRepo := filepath.Join(pathLib, "worktree")
+
+	cleanup := func() {
+		require.NoError(t, fixtures.Clean())
+		require.NoError(t, os.RemoveAll(pathLib))
+	}
+
+	err := os.MkdirAll(pathLib, 0777)
+	require.NoError(t, err)
+
+	err = os.Rename(path, pathRepo)
+	require.NoError(t, err)
+
+	lib := plain.NewLibrary("plain")
+	loc, err := plain.NewLocation("location", osfs.New(pathLib), nil)
+	require.NoError(t, err)
+	lib.AddLocation(loc)
+
+	pool := gitbase.NewRepositoryPool(cache.DefaultMaxSize, lib)
+
+	return pool, cleanup
+}