gitbase: fix close repository test

Also fix some repositories left open.

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

blobs.go

@@ -347,12 +347,7 @@ func newBlobsKeyValueIter(
 		return nil, err
 	}
 
-	r, err := pool.GetRepo(repo.ID())
-	if err != nil {
-		return nil, err
-	}
-
-	idx, err := newRepositoryIndex(r)
+	idx, err := newRepositoryIndex(repo)
 	if err != nil {
 		return nil, err
 	}

blobs_test.go

@@ -238,10 +238,10 @@ func TestBlobsIndex(t *testing.T) {
 	)
 }
 
-// func TestBlobsIndexIterClosed(t *testing.T) {
-// 	testTableIndexIterClosed(t, new(blobsTable))
-// }
+func TestBlobsIndexIterClosed(t *testing.T) {
+	testTableIndexIterClosed(t, new(blobsTable))
+}
 
-// func TestBlobsIterClosed(t *testing.T) {
-// 	testTableIterClosed(t, new(blobsTable))
-// }
+func TestBlobsIterClosed(t *testing.T) {
+	testTableIterClosed(t, new(blobsTable))
+}

commit_blobs_test.go

@@ -1,10 +1,12 @@
 package gitbase
 
 import (
+	"io"
 	"testing"
 
 	"github.com/src-d/go-mysql-server/sql"
 	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/src-d/go-git.v4/plumbing"
 )
@@ -203,28 +205,28 @@ func TestCommitBlobsRowKeyMapper(t *testing.T) {
 	require.Equal(row, row2)
 }
 
-// func TestCommitBlobsIndexIterClosed(t *testing.T) {
-// 	testTableIndexIterClosed(t, new(commitBlobsTable))
-// }
-
-// // This one is not using testTableIterClosed as it takes too much time
-// // to go through all the rows. Here we limit it to the first 100.
-// func TestCommitBlobsIterClosed(t *testing.T) {
-// 	require := require.New(t)
-// 	ctx, closed := setupSivaCloseRepos(t, "_testdata")
-
-// 	table := new(commitBlobsTable)
-// 	iter, err := plan.NewResolvedTable(table).RowIter(ctx)
-// 	require.NoError(err)
-
-// 	for i := 0; i < 100; i++ {
-// 		_, err = iter.Next()
-// 		if err != nil {
-// 			require.Equal(io.EOF, err)
-// 			break
-// 		}
-// 	}
-
-// 	iter.Close()
-// 	require.True(closed.Check())
-// }
+func TestCommitBlobsIndexIterClosed(t *testing.T) {
+	testTableIndexIterClosed(t, new(commitBlobsTable))
+}
+
+// This one is not using testTableIterClosed as it takes too much time
+// to go through all the rows. Here we limit it to the first 100.
+func TestCommitBlobsIterClosed(t *testing.T) {
+	require := require.New(t)
+	ctx, closed := setupSivaCloseRepos(t, "_testdata")
+
+	table := new(commitBlobsTable)
+	iter, err := plan.NewResolvedTable(table).RowIter(ctx)
+	require.NoError(err)
+
+	for i := 0; i < 100; i++ {
+		_, err = iter.Next()
+		if err != nil {
+			require.Equal(io.EOF, err)
+			break
+		}
+	}
+
+	iter.Close()
+	require.True(closed.Check())
+}

commit_files_test.go

@@ -121,13 +121,13 @@ func TestEncodeCommitFileIndexKey(t *testing.T) {
 	require.Equal(k, k2)
 }
 
-// func TestCommitFilesIndexIterClosed(t *testing.T) {
-// 	testTableIndexIterClosed(t, new(commitFilesTable))
-// }
+func TestCommitFilesIndexIterClosed(t *testing.T) {
+	testTableIndexIterClosed(t, new(commitFilesTable))
+}
 
-// func TestCommitFilesIterClosed(t *testing.T) {
-// 	testTableIterClosed(t, new(commitFilesTable))
-// }
+func TestCommitFilesIterClosed(t *testing.T) {
+	testTableIterClosed(t, new(commitFilesTable))
+}
 
 func TestPartitionRowsWithIndex(t *testing.T) {
 	require := require.New(t)

commit_trees_test.go

@@ -169,10 +169,10 @@ func TestCommitTreesRowKeyMapper(t *testing.T) {
 	require.Equal(row, row2)
 }
 
-// func TestCommitTreesIndexIterClosed(t *testing.T) {
-// 	testTableIndexIterClosed(t, new(commitTreesTable))
-// }
+func TestCommitTreesIndexIterClosed(t *testing.T) {
+	testTableIndexIterClosed(t, new(commitTreesTable))
+}
 
-// func TestCommitTreesIterClosed(t *testing.T) {
-// 	testTableIterClosed(t, new(commitTreesTable))
-// }
+func TestCommitTreesIterClosed(t *testing.T) {
+	testTableIterClosed(t, new(commitTreesTable))
+}

commits_test.go

@@ -297,15 +297,15 @@ func TestCommitsIndex(t *testing.T) {
 	)
 }
 
-// func TestCommitsIndexIterClosed(t *testing.T) {
-// 	testTableIndexIterClosed(t, new(commitsTable))
-// }
-
-// func TestCommitsIterClosed(t *testing.T) {
-// 	testTableIterClosed(t, new(commitsTable))
-// }
-
-// func TestCommitsIterators(t *testing.T) {
-// 	// columns names just for debugging
-// 	testTableIterators(t, new(commitsTable), []string{"commit_hash", "commit_author_email"})
-// }
+func TestCommitsIndexIterClosed(t *testing.T) {
+	testTableIndexIterClosed(t, new(commitsTable))
+}
+
+func TestCommitsIterClosed(t *testing.T) {
+	testTableIterClosed(t, new(commitsTable))
+}
+
+func TestCommitsIterators(t *testing.T) {
+	// columns names just for debugging
+	testTableIterators(t, new(commitsTable), []string{"commit_hash", "commit_author_email"})
+}