Use Docker Compose for testing.

AlekSi · AlekSi · commit de4b69f968b7 · 2018-01-25T13:52:45.000+03:00
diff --git a/.testing/testing-server.cnf b/.testing/testing-server.cnf
@@ -0,0 +1,4 @@
+[server]
+innodb_log_file_size=256MB
+innodb_buffer_pool_size=512MB
+max_allowed_packet=16MB
diff --git a/.testing/wait_mysql.sh b/.testing/wait_mysql.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+while :
+do
+    sleep 1
+    if mysql --user=gotest --password=secret --host=127.0.0.1 --port=3307 -e 'SELECT version()'; then
+        break
+    fi
+done
diff --git a/.travis.yml b/.travis.yml
@@ -1,92 +1,52 @@
-sudo: false
+dist: trusty
+sudo: required
 language: go
+
+services:
+  - docker
+
 go:
   - 1.7.x
   - 1.8.x
   - 1.9.x
   - master
 
-before_install:
-  - go get golang.org/x/tools/cmd/cover
-  - go get github.com/mattn/goveralls
+env:
+  global:
+    - MYSQL_TEST_USER=gotest
+    - MYSQL_TEST_PASS=secret
+    - MYSQL_TEST_ADDR=127.0.0.1:3307
+    - MYSQL_TEST_CONCURRENT=1
 
-before_script:
-  - echo -e "[server]\ninnodb_log_file_size=256MB\ninnodb_buffer_pool_size=512MB\nmax_allowed_packet=16MB" | sudo tee -a /etc/mysql/my.cnf
-  - sudo service mysql restart
-  - .travis/wait_mysql.sh
-  - mysql -e 'create database gotest;'
+  # https://www.mysql.com/support/supportedplatforms/database.html
+  # https://mariadb.org/about/maintenance-policy/
+  matrix:
+    - MYSQL_IMAGE=mysql:5.5
+    - MYSQL_IMAGE=mysql:5.6
+    - MYSQL_IMAGE=mysql:5.7
+    # - MYSQL_IMAGE=mysql:8.0
+    - MYSQL_IMAGE=mariadb:5.5
+    - MYSQL_IMAGE=mariadb:10.0
+    - MYSQL_IMAGE=mariadb:10.1
+    - MYSQL_IMAGE=mariadb:10.2
+    - MYSQL_IMAGE=mariadb:10.3
 
-matrix:
-  include:
-    - env: DB=MYSQL57
-      sudo: required
-      dist: trusty
-      go: 1.9.x
-      services:
-        - docker
-      before_install:
-        - go get golang.org/x/tools/cmd/cover
-        - go get github.com/mattn/goveralls
-        - docker pull mysql:5.7
-        - docker run -d -p 127.0.0.1:3307:3306 --name mysqld -e MYSQL_DATABASE=gotest -e MYSQL_USER=gotest -e MYSQL_PASSWORD=secret -e MYSQL_ROOT_PASSWORD=verysecret
-          mysql:5.7 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB
-        - sleep 30
-        - cp .travis/docker.cnf ~/.my.cnf
-        - mysql --print-defaults
-        - .travis/wait_mysql.sh
-      before_script:
-        - export MYSQL_TEST_USER=gotest
-        - export MYSQL_TEST_PASS=secret
-        - export MYSQL_TEST_ADDR=127.0.0.1:3307
-        - export MYSQL_TEST_CONCURRENT=1
+go_import_path: github.com/go-sql-driver/mysql
 
-    - env: DB=MARIA55
-      sudo: required
-      dist: trusty
-      go: 1.9.x
-      services:
-        - docker
-      before_install:
-        - go get golang.org/x/tools/cmd/cover
-        - go get github.com/mattn/goveralls
-        - docker pull mariadb:5.5
-        - docker run -d -p 127.0.0.1:3307:3306 --name mysqld -e MYSQL_DATABASE=gotest -e MYSQL_USER=gotest -e MYSQL_PASSWORD=secret -e MYSQL_ROOT_PASSWORD=verysecret
-          mariadb:5.5 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB
-        - sleep 30
-        - cp .travis/docker.cnf ~/.my.cnf
-        - mysql --print-defaults
-        - .travis/wait_mysql.sh
-      before_script:
-        - export MYSQL_TEST_USER=gotest
-        - export MYSQL_TEST_PASS=secret
-        - export MYSQL_TEST_ADDR=127.0.0.1:3307
-        - export MYSQL_TEST_CONCURRENT=1
+before_install:
+  - go get -u github.com/mattn/goveralls
 
-    - env: DB=MARIA10_1
-      sudo: required
-      dist: trusty
-      go: 1.9.x
-      services:
-        - docker
-      before_install:
-        - go get golang.org/x/tools/cmd/cover
-        - go get github.com/mattn/goveralls
-        - docker pull mariadb:10.1
-        - docker run -d -p 127.0.0.1:3307:3306 --name mysqld -e MYSQL_DATABASE=gotest -e MYSQL_USER=gotest -e MYSQL_PASSWORD=secret -e MYSQL_ROOT_PASSWORD=verysecret
-          mariadb:10.1 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB
-        - sleep 30
-        - cp .travis/docker.cnf ~/.my.cnf
-        - mysql --print-defaults
-        - .travis/wait_mysql.sh
-      before_script:
-        - export MYSQL_TEST_USER=gotest
-        - export MYSQL_TEST_PASS=secret
-        - export MYSQL_TEST_ADDR=127.0.0.1:3307
-        - export MYSQL_TEST_CONCURRENT=1
+before_script:
+  - sudo service mysql stop
+  - docker --version
+  - docker-compose --version
+  - docker-compose up -d
+  - .testing/wait_mysql.sh
 
 script:
   - go test -v -covermode=count -coverprofile=coverage.out
   - go vet ./...
   - test -z "$(gofmt -d -s . | tee /dev/stderr)"
+
 after_script:
-  - $HOME/gopath/bin/goveralls -coverprofile=coverage.out -service=travis-ci
+  - goveralls -coverprofile=coverage.out -service=travis-ci
diff --git a/.travis/docker.cnf b/.travis/docker.cnf
diff --git a/.travis/wait_mysql.sh b/.travis/wait_mysql.sh
diff --git a/AUTHORS b/AUTHORS
@@ -13,6 +13,7 @@
 
 Aaron Hopkins <go-sql-driver at die.net>
 Achille Roussel <achille.roussel at gmail.com>
+Alexey Palazhchenko <alexey.palazhchenko at gmail.com>
 Arne Hormann <arnehormann at gmail.com>
 Asta Xie <xiemengjun at gmail.com>
 Bulat Gaifullin <gaifullinbf at gmail.com>
@@ -61,8 +62,8 @@ Paul Bonser <misterpib at gmail.com>
 Peter Schultz <peter.schultz at classmarkets.com>
 Rebecca Chin <rchin at pivotal.io>
 Reed Allman <rdallman10 at gmail.com>
-Runrioter Wung <runrioter at gmail.com>
 Robert Russell <robert at rrbrussell.com>
+Runrioter Wung <runrioter at gmail.com>
 Shuode Li <elemount at qq.com>
 Soroush Pour <me at soroushjp.com>
 Stan Putrya <root.vagner at gmail.com>
@@ -79,5 +80,6 @@ Counting Ltd.
 Google Inc.
 InfoSum Ltd.
 Keybase Inc.
+Percona LLC
 Pivotal Inc.
 Stripe Inc.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,15 @@
+# see CONTRIBUTING.md
+---
+version: '3'
+services:
+  mysql:
+    image: ${MYSQL_IMAGE:-mysql:5.7}
+    environment:
+      - MYSQL_ROOT_PASSWORD=verysecret
+      - MYSQL_USER=gotest
+      - MYSQL_PASSWORD=secret
+      - MYSQL_DATABASE=gotest
+    ports:
+      - 127.0.0.1:3307:3306
+    volumes:
+      - .testing/testing-server.cnf:/etc/mysql/conf.d/testing-server.cnf
diff --git a/driver_test.go b/driver_test.go
@@ -63,10 +63,10 @@ func init() {
 		}
 		return defaultValue
 	}
-	user = env("MYSQL_TEST_USER", "root")
-	pass = env("MYSQL_TEST_PASS", "")
+	user = env("MYSQL_TEST_USER", "gotest")
+	pass = env("MYSQL_TEST_PASS", "secret")
 	prot = env("MYSQL_TEST_PROT", "tcp")
-	addr = env("MYSQL_TEST_ADDR", "localhost:3306")
+	addr = env("MYSQL_TEST_ADDR", "127.0.0.1:3307")
 	dbname = env("MYSQL_TEST_DBNAME", "gotest")
 	netAddr = fmt.Sprintf("%s(%s)", prot, addr)
 	dsn = fmt.Sprintf("%s:%s@%s/%s?timeout=30s", user, pass, netAddr, dbname)

-Original file line number
+Diff line change
@@ @@ -0,0 +1,8 @@ @@
 +#!/bin/sh
 +while :
 +do
 +    sleep 1
 +    if mysql --user=gotest --password=secret --host=127.0.0.1 --port=3307 -e 'SELECT version()'; then
 +        break
 +    fi
 +done
Original file line number	Diff line number	Diff line change
`@@ -63,10 +63,10 @@ func init() {`
`63`	`63`	`}`
`64`	`64`	`return defaultValue`
`65`	`65`	`}`
`66`		`- user = env("MYSQL_TEST_USER", "root")`
`67`		`- pass = env("MYSQL_TEST_PASS", "")`
	`66`	`+ user = env("MYSQL_TEST_USER", "gotest")`
	`67`	`+ pass = env("MYSQL_TEST_PASS", "secret")`
`68`	`68`	`prot = env("MYSQL_TEST_PROT", "tcp")`
`69`		`- addr = env("MYSQL_TEST_ADDR", "localhost:3306")`
	`69`	`+ addr = env("MYSQL_TEST_ADDR", "127.0.0.1:3307")`
`70`	`70`	`dbname = env("MYSQL_TEST_DBNAME", "gotest")`
`71`	`71`	`netAddr = fmt.Sprintf("%s(%s)", prot, addr)`
`72`	`72`	`dsn = fmt.Sprintf("%s:%s@%s/%s?timeout=30s", user, pass, netAddr, dbname)`