Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dockertest: use official mysql image 

Because orchardup/mysql is deprecated.

I had to increase the timeout, because this image takes at least twice
as long to start compared with the orchardup one. (tests went from ~5s to
~11s here).

Change-Id: I42c485d736c65ce9d93aabf02b1de73e6ac799ff
This commit is contained in:
mpl 2016-01-06 19:26:08 +01:00
parent 00f370f38c
commit 4662076934
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/test/dockertest/docker.go
View File

@ -189,12 +189,8 @@ func setupContainer(t *testing.T, image string, port int, timeout time.Duration,
}
const (
mongoImage = "mpl7/mongo"
// TODO(mpl): there's now an official mysql image at
// https://registry.hub.docker.com/_/mysql/ . We should either directly use one from
// there or fetch one there anyway to host it at
// https://console.developers.google.com/project/camlistore-website
mysqlImage = "orchardup/mysql"
mongoImage = "mpl7/mongo"
mysqlImage = "mysql"
MySQLUsername = "root"
MySQLPassword = "root"
postgresImage = "nornagon/postgres"
@ -215,9 +211,9 @@ func SetupMongoContainer(t *testing.T) (c ContainerID, ip string) {
// SetupMySQLContainer sets up a real MySQL instance for testing purposes,
// using a Docker container. It returns the container ID and its IP address,
// or makes the test fail on error.
// Currently using https://index.docker.io/u/orchardup/mysql/
// Currently using https://hub.docker.com/_/mysql/
func SetupMySQLContainer(t *testing.T, dbname string) (c ContainerID, ip string) {
return setupContainer(t, mysqlImage, 3306, 10*time.Second, func() (string, error) {
return setupContainer(t, mysqlImage, 3306, 20*time.Second, func() (string, error) {
return run("-d", "-e", "MYSQL_ROOT_PASSWORD="+MySQLPassword, "-e", "MYSQL_DATABASE="+dbname, mysqlImage)
})
}