tests: make regression tests use squash rule

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

Author: erizocosmico

regression_test.go

@@ -7,9 +7,9 @@ import (
 	"testing"
 
 	"github.com/src-d/gitbase"
-	"github.com/stretchr/testify/require"
 	"github.com/src-d/go-mysql-server/sql"
 	"github.com/src-d/go-mysql-server/sql/index/pilosa"
+	"github.com/stretchr/testify/require"
 	yaml "gopkg.in/yaml.v2"
 )
 
@@ -20,13 +20,12 @@ type Query struct {
 }
 
 func TestRegressionQueries(t *testing.T) {
-	require := require.New(t)
-
-	engine, pool, cleanup := setup(t)
+	_, pool, cleanup := setup(t)
 	defer cleanup()
 
+	engine := newSquashEngine(pool)
 	tmpDir, err := ioutil.TempDir(os.TempDir(), "pilosa-idx-gitbase")
-	require.NoError(err)
+	require.NoError(t, err)
 	defer os.RemoveAll(tmpDir)
 	engine.Catalog.RegisterIndexDriver(pilosa.NewDriver(tmpDir))
 
@@ -36,20 +35,23 @@ func TestRegressionQueries(t *testing.T) {
 	)
 
 	queries, err := loadQueriesYaml("./_testdata/regression.yml")
-	require.NoError(err)
+	require.NoError(t, err)
 
 	for _, q := range queries {
-		for _, stmt := range q.Statements {
-			_, iter, err := engine.Query(ctx, stmt)
-			if err != nil {
-				require.Failf(err.Error(), "ID: %s, Name: %s, Statement: %s", q.ID, q.Name, stmt)
-			}
+		t.Run(q.ID, func(t *testing.T) {
+			require := require.New(t)
+			for _, stmt := range q.Statements {
+				_, iter, err := engine.Query(ctx, stmt)
+				if err != nil {
+					require.Failf(err.Error(), "ID: %s, Name: %s, Statement: %s", q.ID, q.Name, stmt)
+				}
 
-			_, err = sql.RowIterToRows(iter)
-			if err != nil {
-				require.Failf(err.Error(), "ID: %s, Name: %s, Statement: %s", q.ID, q.Name, stmt)
+				_, err = sql.RowIterToRows(iter)
+				if err != nil {
+					require.Failf(err.Error(), "ID: %s, Name: %s, Statement: %s", q.ID, q.Name, stmt)
+				}
 			}
-		}
+		})
 	}
 }