gitbase: call Close on tests, improve coverage

Signed-off-by: Miguel Molina <[email protected]>

Author: erizocosmico

cmd/gitbase/command/server.go

@@ -6,7 +6,6 @@ import (
 	"path/filepath"
 	"strconv"
 
-	"github.com/prometheus/common/log"
 	"github.com/src-d/gitbase"
 	"github.com/src-d/gitbase/internal/function"
 	"github.com/src-d/gitbase/internal/rule"
@@ -110,22 +109,34 @@ func (c *Server) buildDatabase() error {
 	c.engine.Catalog.RegisterFunctions(function.Functions)
 	logrus.Debug("registered all available functions in catalog")
 
+	if err := c.registerDrivers(); err != nil {
+		return err
+	}
+
+	if c.UnstableSquash {
+		logrus.Warn("unstable squash tables rule is enabled")
+		c.engine.Analyzer.AddRule(rule.SquashJoinsRule, rule.SquashJoins)
+	}
+
+	return nil
+}
+
+func (c *Server) registerDrivers() error {
 	if err := os.MkdirAll(c.IndexDir, 0755); err != nil {
 		return err
 	}
 
+	logrus.Debug("created index storage")
+
 	client, err := gopilosa.NewClient(c.PilosaURL)
 	if err != nil {
 		return err
 	}
 
-	c.engine.Catalog.RegisterIndexDriver(pilosa.NewDriver(c.IndexDir, client))
-	log.Debug("registered pilosa index driver")
+	logrus.Debug("established connection with pilosa")
 
-	if c.UnstableSquash {
-		logrus.Warn("unstable squash tables rule is enabled")
-		c.engine.Analyzer.AddRule(rule.SquashJoinsRule, rule.SquashJoins)
-	}
+	c.engine.Catalog.RegisterIndexDriver(pilosa.NewDriver(c.IndexDir, client))
+	logrus.Debug("registered pilosa index driver")
 
 	return nil
 }

index_test.go

@@ -42,21 +42,24 @@ type keyValue struct {
 
 func assertIndexKeyValueIter(t *testing.T, iter sql.IndexKeyValueIter, expected []keyValue) {
 	t.Helper()
+	require := require.New(t)
+
 	var result []keyValue
 	for {
 		values, key, err := iter.Next()
 		if err == io.EOF {
 			break
 		}
-		require.NoError(t, err)
+		require.NoError(err)
 
 		result = append(result, keyValue{key, values})
 	}
 
-	require.Equal(t, len(expected), len(result), "size does not match")
+	require.NoError(iter.Close())
+	require.Equal(len(expected), len(result), "size does not match")
 
 	for i, r := range result {
-		require.Equal(t, expected[i], r, "at position %d", i)
+		require.Equal(expected[i], r, "at position %d", i)
 	}
 }
 
@@ -74,6 +77,8 @@ func tableIndexValues(t *testing.T, table Indexable, ctx *sql.Context) sql.Index
 		values = append(values, val)
 	}
 
+	require.NoError(t, kvIter.Close())
+
 	return newIndexValueIter(values...)
 }
 

packfiles_test.go

@@ -1,7 +1,6 @@
 package gitbase
 
 import (
-	"fmt"
 	"path/filepath"
 	"testing"
 
@@ -16,7 +15,6 @@ func TestRepositoryPackfiles(t *testing.T) {
 
 	fs, packfiles, err := repositoryPackfiles(testSivaFilePath, sivaRepo)
 
-	fmt.Println(packfiles[0].String())
 	require.NoError(err)
 	require.Equal([]plumbing.Hash{
 		plumbing.NewHash("5d2ce6a45cb07803f9b0c8040e730f5715fc7144"),

ref_commits.go

@@ -1,7 +1,6 @@
 package gitbase
 
 import (
-	"fmt"
 	"io"
 	"strings"
 
@@ -148,8 +147,6 @@ func refCommitsIterBuilder(ctx *sql.Context, selectors selectors, columns []sql.
 		names[i] = strings.ToLower(names[i])
 	}
 
-	fmt.Println("CTX from builder", ctx)
-
 	return &refCommitsIter{
 		ctx:      ctx,
 		refNames: names,

remotes.go

@@ -1,7 +1,6 @@
 package gitbase
 
 import (
-	"fmt"
 	"io"
 
 	git "gopkg.in/src-d/go-git.v4"
@@ -253,8 +252,6 @@ func (i *remotesKeyValueIter) Next() ([]interface{}, []byte, error) {
 
 		i.urlPos++
 
-		fmt.Println(remoteIndexKey{i.repo.ID, i.pos, i.urlPos - 1})
-
 		key, err := encodeIndexKey(remoteIndexKey{i.repo.ID, i.pos, i.urlPos - 1})
 		if err != nil {
 			return nil, nil, err

repositories_test.go

@@ -132,6 +132,11 @@ func TestRepositoriesIndex(t *testing.T) {
 	testTableIndex(
 		t,
 		new(repositoriesTable),
-		nil,
+		[]sql.Expression{
+			expression.NewEquals(
+				expression.NewGetFieldWithTable(0, sql.Text, RepositoriesTableName, "repository_id", false),
+				expression.NewLiteral("non-existent-repo", sql.Text),
+			),
+		},
 	)
 }