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

always use boulder-mysql, not localhost, for mysql 

This followup for #1639 to always use the boulder-mysql, not localhost, when connecting to mysql database when testing.
This commit is contained in:
Igor Bukanov 2016-04-07 10:08:30 +02:00
parent 31455dc6fc
commit 7b14242079
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
policy/_db/dbconf.yml
View File

@ -1,6 +1,6 @@
test:
driver: mysql
open: root@tcp(localhost:3306)/boulder_policy_test
open: root@tcp(boulder-mysql:3306)/boulder_policy_test
integration:
driver: mysql
open: root@tcp(localhost:3306)/boulder_policy_integration
open: root@tcp(boulder-mysql:3306)/boulder_policy_integration

4
sa/database_test.go
View File

@ -21,8 +21,8 @@ func TestInvalidDSN(t *testing.T) {
var errExpected = errors.New("expected")
func TestNewDbMap(t *testing.T) {
const mysqlConnectURL = "mysql+tcp://policy:password@localhost:3306/boulder_policy_integration?readTimeout=800ms&writeTimeout=800ms"
const expectedTransformed = "policy:password@tcp(localhost:3306)/boulder_policy_integration?clientFoundRows=true&parseTime=true&readTimeout=800ms&strict=true&writeTimeout=800ms"
const mysqlConnectURL = "mysql+tcp://policy:password@boulder-mysql:3306/boulder_policy_integration?readTimeout=800ms&writeTimeout=800ms"
const expectedTransformed = "policy:password@tcp(boulder-mysql:3306)/boulder_policy_integration?clientFoundRows=true&parseTime=true&readTimeout=800ms&strict=true&writeTimeout=800ms"
oldSQLOpen := sqlOpen
defer func() {

2
test/boulder-config-next.json
View File

@ -236,7 +236,7 @@
},
"ocspResponder": {
"source": "mysql+tcp://ocsp_resp@localhost:3306/boulder_sa_integration?readTimeout=800ms&writeTimeout=800ms",
"source": "mysql+tcp://ocsp_resp@boulder-mysql:3306/boulder_sa_integration?readTimeout=800ms&writeTimeout=800ms",
"path": "/",
"listenAddress": "localhost:4002",
"maxAge": "10s",

2
test/db.go
View File

@ -41,7 +41,7 @@ func ResetPolicyTestDatabase(t testing.TB) func() {
}
func resetTestDatabase(t testing.TB, dbType string) func() {
db, err := sql.Open("mysql", fmt.Sprintf("test_setup@tcp(localhost:3306)/boulder_%s_test", dbType))
db, err := sql.Open("mysql", fmt.Sprintf("test_setup@tcp(boulder-mysql:3306)/boulder_%s_test", dbType))
if err != nil {
t.Fatalf("Couldn't create db: %s", err)
}

2
test/vars/vars.go
View File

@ -3,7 +3,7 @@ package vars
import "fmt"
const (
dbURL = "mysql+tcp://%s@localhost:3306/%s"
dbURL = "mysql+tcp://%s@boulder-mysql:3306/%s"
)
var (