Merge pull request #407 from smacker/wait_for_index

integration tests: wait for index creation

Author: smacker

cmdtests/gitbase_back_comp_test.go

@@ -17,9 +17,9 @@ import (
 	"github.com/src-d/engine/cmdtests"
 	"gotest.tools/icmd"
 
-	"gopkg.in/src-d/regression-core.v0"
+	regression "gopkg.in/src-d/regression-core.v0"
 
-	"github.com/mitchellh/go-homedir"
+	homedir "github.com/mitchellh/go-homedir"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -187,8 +187,9 @@ func (s *GitbaseBackCompTestSuite) TestRetroCompatibleIndexes() {
 	// [previous version] srcd sql "CREATE INDEXES"
 	r = s.runSQL(s.PrevCmd, "CREATE INDEX repo_idx ON repositories USING pilosa (repository_id)")
 	require.NoError(r.Error, r.Combined())
-	// wait a bit for index to be ready
-	time.Sleep(1 * time.Second)
+
+	// wait for index to be visible, full output assert below
+	IndexIsVisible(s, "repositories", "repo_idx")
 
 	// [previous version] srcd sql "SHOW INDEXES"
 	r = s.runSQL(s.PrevCmd, "SHOW INDEX FROM repositories")

cmdtests/sql_index_util.go

@@ -0,0 +1,56 @@
+// +build integration regression
+
+package cmdtests
+
+import (
+	"strings"
+	"time"
+
+	"github.com/stretchr/testify/require"
+	"gotest.tools/icmd"
+)
+
+// building/loading index takes some time, wait maximum 15s
+func IndexIsVisible(s commandSuite, table, name string) bool {
+	for i := 0; i < 15; i++ {
+		if hasIndex(s, table, name) {
+			return true
+		}
+		time.Sleep(time.Second)
+	}
+
+	return hasIndex(s, table, name)
+}
+
+func hasIndex(s commandSuite, table, name string) bool {
+	r := s.RunCommand("sql", "SHOW INDEX FROM "+table)
+	s.Require().NoError(r.Error, r.Combined())
+
+	// parse result and check that correct index was built and it is visiable
+	// see example output here: https://dev.mysql.com/doc/refman/8.0/en/show-index.html
+	lines := strings.Split(r.Stdout(), "\n")
+	for _, line := range lines {
+		cols := strings.Split(line, "|")
+		if len(cols) < 15 {
+			continue
+		}
+		if strings.TrimSpace(cols[1]) != table {
+			continue
+		}
+		if strings.TrimSpace(cols[3]) != name {
+			continue
+		}
+
+		if strings.TrimSpace(cols[14]) == "YES" {
+			return true
+		}
+		return false
+	}
+
+	return false
+}
+
+type commandSuite interface {
+	RunCommand(cmd string, args ...string) *icmd.Result
+	Require() *require.Assertions
+}

cmdtests/sql_test.go

@@ -335,8 +335,6 @@ func (s *SQLTestSuite) TestIndexesWorkdirChange() {
 	r = s.RunCommand("sql", "CREATE INDEX repo_idx ON repositories USING pilosa (repository_id)")
 	require.NoError(err, r.Stdout())
 
-	time.Sleep(1 * time.Second) // wait for index to be built
-
 	s.testQueryWithIndex(require, "repos", true)
 
 	// workdir 2
@@ -360,26 +358,16 @@ func (s *SQLTestSuite) TestIndexesWorkdirChange() {
 	// wait for gitbase to be ready
 	r = s.RunCommand("sql", "select 1")
 	require.NoError(r.Error, r.Combined())
-	// wait for gitbase to load index
-	time.Sleep(1 * time.Second)
 
 	s.testQueryWithIndex(require, "repos", true)
 }
 
 func (s *SQLTestSuite) testQueryWithIndex(require *require.Assertions, repo string, hasIndex bool) {
-	r := s.RunCommand("sql", "SHOW INDEX FROM repositories")
-	require.NoError(r.Error, r.Combined())
-
 	if hasIndex {
-		// parse result and check that correct index was built and it is visiable
-		indexLine := strings.Split(r.Stdout(), "\n")[3]
-		expected := `repositories.repository_id`
-		require.Contains(indexLine, expected)
-		visibleValue := strings.TrimSpace(strings.Split(indexLine, "|")[14])
-		require.Equal("YES", visibleValue)
+		require.True(cmdtests.IndexIsVisible(s, "repositories", "repo_idx"))
 	}
 
-	r = s.RunCommand("sql", "EXPLAIN FORMAT=TREE select * from repositories WHERE repository_id='"+repo+"'")
+	r := s.RunCommand("sql", "EXPLAIN FORMAT=TREE select * from repositories WHERE repository_id='"+repo+"'")
 	require.NoError(r.Error, r.Combined())
 	if hasIndex {
 		require.Contains(r.Stdout(), "Indexes")