Merge pull request #6 from vitessio/install

Make vitess-tester work with go install

Makefile

@@ -5,10 +5,7 @@ GO := go
 default: build
 
 build:
-	$(GO) build -o vitess-tester ./src/vitess-tester
-
-debug:
-	$(GO) build -gcflags="all=-N -l" -o vitess-tester ./src/vitess-tester
+	$(GO) build -o vitess-tester ./
 
 test: build
 	$(GO) test -cover ./...
@@ -20,6 +17,3 @@ tidy:
 clean:
 	$(GO) clean -i ./...
 	rm -rf vitess-tester
-
-gen_perror: generate_perror/main.go
-	$(GO) build -o gen_perror ./generate_perror

src/vitess-tester/main.go → main.go

@@ -27,6 +27,8 @@ import (
 	"vitess.io/vitess/go/test/endtoend/utils"
 	"vitess.io/vitess/go/vt/sqlparser"
 	"vitess.io/vitess/go/vt/vtgate/vindexes"
+
+	vitess_tester "github.com/vitessio/vitess-tester/src/vitess-tester"
 )
 
 var (
@@ -45,13 +47,6 @@ func init() {
 	flag.BoolVar(&xunit, "xunit", false, "Get output in an xml file instead of errors directory")
 }
 
-type query struct {
-	firstWord string
-	Query     string
-	Line      int
-	tp        CmdType
-}
-
 func loadAllTests() (tests []string, err error) {
 	// tests must be in t folder or subdir in t folder
 	err = filepath.Walk("./t/", func(path string, info os.FileInfo, err error) error {
@@ -72,10 +67,10 @@ func loadAllTests() (tests []string, err error) {
 	return tests, nil
 }
 
-func executeTests(fileNames []string, s Suite) (failed bool) {
+func executeTests(clusterInstance *cluster.LocalProcessCluster, vtParams, mysqlParams mysql.ConnParams, fileNames []string, s vitess_tester.Suite) (failed bool) {
 	for _, name := range fileNames {
 		errReporter := s.NewReporterForFile(name)
-		vTester := newTester(name, errReporter)
+		vTester := vitess_tester.NewTester(name, errReporter, clusterInstance, vtParams, mysqlParams, olap, keyspaceName, vschema, vschemaFile)
 		err := vTester.Run()
 		if err != nil {
 			failed = true
@@ -88,12 +83,8 @@ func executeTests(fileNames []string, s Suite) (failed bool) {
 }
 
 var (
-	clusterInstance *cluster.LocalProcessCluster
-	keyspaceName    = "mysqltest"
-	cell            = "mysqltest"
-
-	vtParams    mysql.ConnParams
-	mysqlParams mysql.ConnParams
+	keyspaceName = "mysqltest"
+	cell         = "mysqltest"
 )
 
 type rawKeyspaceVindex struct {
@@ -122,7 +113,7 @@ var vschema = vindexes.VSchema{
 	},
 }
 
-func setupCluster(sharded bool) func() {
+func setupCluster(sharded bool) (clusterInstance *cluster.LocalProcessCluster, vtParams, mysqlParams mysql.ConnParams, close func()) {
 	clusterInstance = cluster.NewCluster(cell, "localhost")
 
 	// Start topo server
@@ -171,7 +162,7 @@ func setupCluster(sharded bool) func() {
 	}
 	mysqlParams = conn
 
-	return func() {
+	return clusterInstance, vtParams, mysqlParams, func() {
 		clusterInstance.Teardown()
 		closer()
 	}
@@ -257,7 +248,7 @@ func main() {
 
 	log.Infof("running tests: %v", tests)
 
-	closer := setupCluster(sharded)
+	clusterInstance, vtParams, mysqlParams, closer := setupCluster(sharded)
 	defer closer()
 
 	// remove errors folder if exists
@@ -266,13 +257,13 @@ func main() {
 		panic(err.Error())
 	}
 
-	var reporterSuite Suite
+	var reporterSuite vitess_tester.Suite
 	if xunit {
-		reporterSuite = newXMLTestSuite()
+		reporterSuite = vitess_tester.NewXMLTestSuite()
 	} else {
-		reporterSuite = newFileReporterSuite()
+		reporterSuite = vitess_tester.NewFileReporterSuite()
 	}
-	failed := executeTests(tests, reporterSuite)
+	failed := executeTests(clusterInstance, vtParams, mysqlParams, tests, reporterSuite)
 	outputFile := reporterSuite.Close()
 	if failed {
 		log.Errorf("some tests failed 😭\nsee errors in %v", outputFile)

src/vitess-tester/query.go

@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main
+package vitess_tester
 
 import (
 	"strings"
@@ -130,6 +130,13 @@ const (
 	Q_VEXPLAIN
 )
 
+type query struct {
+	firstWord string
+	Query     string
+	Line      int
+	tp        CmdType
+}
+
 // ParseQueries parses an array of string into an array of query object.
 // Note: a query statement may reside in several lines.
 func ParseQueries(qs ...query) ([]query, error) {

src/vitess-tester/query_test.go

@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main
+package vitess_tester
 
 import (
 	"fmt"

src/vitess-tester/reporter.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package vitess_tester
 
 import (
 	"encoding/json"
@@ -24,6 +24,8 @@ import (
 	"path"
 	"strings"
 	"time"
+
+	"vitess.io/vitess/go/vt/vtgate/vindexes"
 )
 
 type Suite interface {
@@ -35,7 +37,7 @@ type Suite interface {
 type Reporter interface {
 	AddTestCase(query string, lineNo int)
 	EndTestCase()
-	AddFailure(err error)
+	AddFailure(vschema vindexes.VSchema, err error)
 	Report() string
 	Failed() bool
 }
@@ -52,7 +54,7 @@ func (frs *FileReporterSuite) Close() string {
 	return "errors"
 }
 
-func newFileReporterSuite() *FileReporterSuite {
+func NewFileReporterSuite() *FileReporterSuite {
 	return &FileReporterSuite{}
 }
 
@@ -115,7 +117,7 @@ func (e *FileReporter) EndTestCase() {
 	}
 }
 
-func (e *FileReporter) AddFailure(err error) {
+func (e *FileReporter) AddFailure(vschema vindexes.VSchema, err error) {
 	e.failureCount++
 	e.currentQueryFailed = true
 	if e.currentQuery == "" {
@@ -130,7 +132,7 @@ func (e *FileReporter) AddFailure(err error) {
 		panic("failed to write error file\n" + err.Error())
 	}
 
-	e.createVSchemaDump()
+	e.createVSchemaDump(vschema)
 }
 
 func (e *FileReporter) createErrorFileFor() *os.File {
@@ -152,7 +154,7 @@ func (e *FileReporter) createErrorFileFor() *os.File {
 	return file
 }
 
-func (e *FileReporter) createVSchemaDump() {
+func (e *FileReporter) createVSchemaDump(vschema vindexes.VSchema) {
 	errorDir := e.errorDir()
 	err := os.MkdirAll(errorDir, PERM)
 	if err != nil {