Skip to content

Commit c4a17aa

Browse files
lance6716lance6716
authored
Merge pull request #762 from go-mysql-org/atercattus/allow-to-run-tests-in-local-docker
Allow to run tests in local environment + fix tests for it
2 parents 3dc80ac + bb0e767 commit c4a17aa

File tree

19 files changed

+120
-71
lines changed

19 files changed

+120
-71
lines changed

‎Makefile‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,19 @@ build:
1111
test:
1212
go test --race -timeout 2m ./...
1313

14+
test-local:
15+
docker run --rm -d --network=host --name go-mysql-server \
16+
-e MYSQL_ALLOW_EMPTY_PASSWORD=true \
17+
-e MYSQL_DATABASE=test \
18+
-v $${PWD}/docker/resources/replication.cnf:/etc/mysql/conf.d/replication.cnf \
19+
mysql:5.7
20+
docker/resources/waitfor.sh 127.0.0.1 3306 \
21+
&& go test -race -v -timeout 2m ./... -gocheck.v
22+
docker stop go-mysql-server
23+
1424
fmt:
1525
golangci-lint run --fix
1626

1727
clean:
1828
go clean -i ./...
19-
@rm -rf ./bin
29+
@rm -rf ./bin

‎canal/canal_test.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
package canal
22

33
import (
4-
"flag"
54
"fmt"
65
"testing"
76
"time"
87

9-
"github.com/go-mysql-org/go-mysql/mysql"
10-
"github.com/go-mysql-org/go-mysql/replication"
118
. "github.com/pingcap/check"
129
"github.com/pingcap/errors"
1310
"github.com/pingcap/tidb/parser"
1411
"github.com/siddontang/go-log/log"
15-
)
1612

17-
var testHost = flag.String("host", "127.0.0.1", "MySQL host")
13+
"github.com/go-mysql-org/go-mysql/mysql"
14+
"github.com/go-mysql-org/go-mysql/replication"
15+
"github.com/go-mysql-org/go-mysql/test_util"
16+
)
1817

1918
func Test(t *testing.T) {
2019
TestingT(t)
@@ -38,7 +37,7 @@ const (
3837

3938
func (s *canalTestSuite) SetUpSuite(c *C) {
4039
cfg := NewDefaultConfig()
41-
cfg.Addr = fmt.Sprintf("%s:3306", *testHost)
40+
cfg.Addr = fmt.Sprintf("%s:%s", *test_util.MysqlHost, *test_util.MysqlPort)
4241
cfg.User = "root"
4342
cfg.HeartbeatPeriod = 200 * time.Millisecond
4443
cfg.ReadTimeout = 300 * time.Millisecond

‎client/client_test.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"github.com/pingcap/errors"
1010

1111
"github.com/go-mysql-org/go-mysql/mysql"
12+
"github.com/go-mysql-org/go-mysql/test_util"
1213
"github.com/go-mysql-org/go-mysql/test_util/test_keys"
1314
)
1415

@@ -19,7 +20,7 @@ type clientTestSuite struct {
1920

2021
func (s *clientTestSuite) SetUpSuite(c *C) {
2122
var err error
22-
addr := fmt.Sprintf("%s:%s", *testHost, s.port)
23+
addr := fmt.Sprintf("%s:%s", *test_util.MysqlHost, s.port)
2324
s.c, err = Connect(addr, *testUser, *testPassword, "")
2425
if err != nil {
2526
c.Fatal(err)
@@ -117,7 +118,7 @@ func (s *clientTestSuite) TestConn_SetCapability(c *C) {
117118
func (s *clientTestSuite) TestConn_TLS_Verify(c *C) {
118119
// Verify that the provided tls.Config is used when attempting to connect to mysql.
119120
// An empty tls.Config will result in a connection error.
120-
addr := fmt.Sprintf("%s:%s", *testHost, s.port)
121+
addr := fmt.Sprintf("%s:%s", *test_util.MysqlHost, s.port)
121122
_, err := Connect(addr, *testUser, *testPassword, *testDB, func(c *Conn) {
122123
c.UseSSL(false)
123124
})
@@ -133,7 +134,7 @@ func (s *clientTestSuite) TestConn_TLS_Verify(c *C) {
133134

134135
func (s *clientTestSuite) TestConn_TLS_Skip_Verify(c *C) {
135136
// An empty tls.Config will result in a connection error but we can configure to skip it.
136-
addr := fmt.Sprintf("%s:%s", *testHost, s.port)
137+
addr := fmt.Sprintf("%s:%s", *test_util.MysqlHost, s.port)
137138
_, err := Connect(addr, *testUser, *testPassword, *testDB, func(c *Conn) {
138139
c.UseSSL(true)
139140
})
@@ -145,7 +146,7 @@ func (s *clientTestSuite) TestConn_TLS_Certificate(c *C) {
145146
// And if server uses auto-generated certificates, it will be an error like:
146147
// "x509: certificate is valid for MySQL_Server_8.0.12_Auto_Generated_Server_Certificate, not not-a-valid-name"
147148
tlsConfig := NewClientTLSConfig(test_keys.CaPem, test_keys.CertPem, test_keys.KeyPem, false, "not-a-valid-name")
148-
addr := fmt.Sprintf("%s:%s", *testHost, s.port)
149+
addr := fmt.Sprintf("%s:%s", *test_util.MysqlHost, s.port)
149150
_, err := Connect(addr, *testUser, *testPassword, *testDB, func(c *Conn) {
150151
c.SetTLSConfig(tlsConfig)
151152
})

‎client/common_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ import (
66
"testing"
77

88
. "github.com/pingcap/check"
9-
)
109

11-
var testHost = flag.String("host", "127.0.0.1", "MySQL server host")
10+
"github.com/go-mysql-org/go-mysql/test_util"
11+
)
1212

13-
// We cover the whole range of MySQL server versions using docker-compose to bind them to different ports for testing.
14-
// MySQL is constantly updating auth plugin to make it secure:
15-
// starting from MySQL 8.0.4, a new auth plugin is introduced, causing plain password auth to fail with error:
16-
// ERROR 1251 (08004): Client does not support authentication protocol requested by server; consider upgrading MySQL client
17-
// Hint: use docker-compose to start corresponding MySQL docker containers and add the their ports here
18-
var testPort = flag.String("port", "3306", "MySQL server port") // choose one or more form 5561,5641,3306,5722,8003,8012,8013, e.g. '3306,5722,8003'
1913
var testUser = flag.String("user", "root", "MySQL user")
2014
var testPassword = flag.String("pass", "", "MySQL password")
2115
var testDB = flag.String("db", "test", "MySQL test database")
2216

2317
func Test(t *testing.T) {
24-
segs := strings.Split(*testPort, ",")
18+
// We cover the whole range of MySQL server versions using docker-compose to bind them to different ports for testing.
19+
// MySQL is constantly updating auth plugin to make it secure:
20+
// starting from MySQL 8.0.4, a new auth plugin is introduced, causing plain password auth to fail with error:
21+
// ERROR 1251 (08004): Client does not support authentication protocol requested by server; consider upgrading MySQL client
22+
// Hint: use docker-compose to start corresponding MySQL docker containers and add their ports here
23+
24+
segs := strings.Split(*test_util.MysqlPort, ",")
2525
for _, seg := range segs {
2626
Suite(&clientTestSuite{port: seg})
2727
Suite(&connTestSuite{port: seg})

‎client/conn_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
. "github.com/pingcap/check"
88

99
"github.com/go-mysql-org/go-mysql/mysql"
10+
"github.com/go-mysql-org/go-mysql/test_util"
1011
)
1112

1213
type connTestSuite struct {
@@ -16,7 +17,7 @@ type connTestSuite struct {
1617

1718
func (s *connTestSuite) SetUpSuite(c *C) {
1819
var err error
19-
addr := fmt.Sprintf("%s:%s", *testHost, s.port)
20+
addr := fmt.Sprintf("%s:%s", *test_util.MysqlHost, s.port)
2021
s.c, err = Connect(addr, *testUser, *testPassword, "", func(c *Conn) {
2122
// required for the ExecuteMultiple test
2223
c.SetCapability(mysql.CLIENT_MULTI_STATEMENTS)

‎docker/resources/replication.cnf‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[mysqld]
2+
server-id=1
3+
log-bin=mysql
4+
binlog-format=row
5+
gtid-mode=ON
6+
enforce_gtid_consistency=ON
7+
#log_error_verbosity=2

‎docker/resources/waitfor.sh‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/bash
2+
host=$1
3+
port=$2
4+
5+
echo "Waiting for mysql at $host:$port"
6+
while true; do
7+
docker run --rm -it --network=host mysql:5.7 mysql -h$host -P$port -e "SELECT RAND()" >/dev/null
8+
if [[ $? -eq 0 ]]; then
9+
echo 'Connected'
10+
break
11+
fi
12+
13+
echo 'Still waiting...'
14+
sleep 1
15+
done

‎driver/driver_test.go‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,10 @@ import (
99

1010
"github.com/jmoiron/sqlx"
1111
. "github.com/pingcap/check"
12-
)
1312

14-
// Use docker mysql to test, mysql is 3306
15-
var testHost = flag.String("host", "127.0.0.1", "MySQL master host")
13+
"github.com/go-mysql-org/go-mysql/test_util"
14+
)
1615

17-
// possible choices for different MySQL versions are: 5561,5641,3306,5722,8003,8012
18-
var testPort = flag.Int("port", 3306, "MySQL server port")
1916
var testUser = flag.String("user", "root", "MySQL user")
2017
var testPassword = flag.String("pass", "", "MySQL password")
2118
var testDB = flag.String("db", "test", "MySQL test database")
@@ -31,8 +28,8 @@ type testDriverSuite struct {
3128
var _ = Suite(&testDriverSuite{})
3229

3330
func (s *testDriverSuite) SetUpSuite(c *C) {
34-
addr := fmt.Sprintf("%s:%d", *testHost, *testPort)
35-
dsn := fmt.Sprintf("%s:%s@%s?%s", *testUser, *testPassword, addr, *testDB)
31+
addr := fmt.Sprintf("%s:%s", *test_util.MysqlHost, *test_util.MysqlPort)
32+
dsn := fmt.Sprintf("%s:%s@%s/%s", *testUser, *testPassword, addr, *testDB)
3633

3734
var err error
3835
s.db, err = sqlx.Open("mysql", dsn)

‎dump/schema_test.go‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ import (
66
"io"
77
"os"
88

9-
"github.com/go-mysql-org/go-mysql/client"
109
. "github.com/pingcap/check"
10+
11+
"github.com/go-mysql-org/go-mysql/client"
12+
"github.com/go-mysql-org/go-mysql/test_util"
1113
)
1214

1315
type schemaTestSuite struct {
@@ -18,11 +20,13 @@ type schemaTestSuite struct {
1820
var _ = Suite(&schemaTestSuite{})
1921

2022
func (s *schemaTestSuite) SetUpSuite(c *C) {
23+
addr := fmt.Sprintf("%s:%s", *test_util.MysqlHost, *test_util.MysqlPort)
24+
2125
var err error
22-
s.conn, err = client.Connect(fmt.Sprintf("%s:%d", *host, *port), "root", "", "")
26+
s.conn, err = client.Connect(addr, "root", "", "")
2327
c.Assert(err, IsNil)
2428

25-
s.d, err = NewDumper(*execution, fmt.Sprintf("%s:%d", *host, *port), "root", "")
29+
s.d, err = NewDumper(*execution, addr, "root", "")
2630
c.Assert(err, IsNil)
2731
c.Assert(s.d, NotNil)
2832

‎dump/setup_test.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ import (
88
. "github.com/pingcap/check"
99
)
1010

11-
// use docker mysql for test
12-
var host = flag.String("host", "127.0.0.1", "MySQL host")
13-
var port = flag.Int("port", 3306, "MySQL port")
14-
1511
var execution = flag.String("exec", "mysqldump", "mysqldump execution path")
1612

1713
func Test(t *testing.T) {

0 commit comments

Comments
 (0)