Remove unnecessary circleci configuration as we're using default
provided services Update test users to use circleci default services
This commit is contained in:
parent
0db55007ab
commit
ae385b336d
14
circle.yml
14
circle.yml
|
@ -1,15 +1,3 @@
|
|||
machine:
|
||||
python:
|
||||
version: 2.7.3
|
||||
services:
|
||||
- docker
|
||||
|
||||
dependencies:
|
||||
pre:
|
||||
- pip install -U docker-compose==1.2.0
|
||||
- docker-compose pull
|
||||
|
||||
|
||||
test:
|
||||
override:
|
||||
- make test
|
||||
- go test -short ./...
|
||||
|
|
|
@ -3,7 +3,7 @@ mysql:
|
|||
ports:
|
||||
- "3306:3306"
|
||||
environment:
|
||||
MYSQL_ALLOW_EMPTY_PASSWORD: true
|
||||
MYSQL_ALLOW_EMPTY_PASSWORD: yes
|
||||
|
||||
memcached:
|
||||
image: memcached
|
||||
|
@ -14,3 +14,5 @@ postgres:
|
|||
image: postgres
|
||||
ports:
|
||||
- "5432:5432"
|
||||
environment:
|
||||
POSTGRES_USER: ubuntu
|
||||
|
|
|
@ -12,7 +12,7 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
|
|||
p := &Postgresql{
|
||||
Servers: []*Server{
|
||||
{
|
||||
Address: "host=localhost user=postgres sslmode=disable",
|
||||
Address: "host=localhost user=ubuntu sslmode=disable",
|
||||
Databases: []string{"postgres"},
|
||||
},
|
||||
},
|
||||
|
@ -57,7 +57,7 @@ func TestPostgresqlTagsMetricsWithDatabaseName(t *testing.T) {
|
|||
p := &Postgresql{
|
||||
Servers: []*Server{
|
||||
{
|
||||
Address: "host=localhost user=postgres sslmode=disable",
|
||||
Address: "host=localhost user=ubuntu sslmode=disable",
|
||||
Databases: []string{"postgres"},
|
||||
},
|
||||
},
|
||||
|
@ -78,7 +78,7 @@ func TestPostgresqlDefaultsToAllDatabases(t *testing.T) {
|
|||
p := &Postgresql{
|
||||
Servers: []*Server{
|
||||
{
|
||||
Address: "host=localhost user=postgres sslmode=disable",
|
||||
Address: "host=localhost user=ubuntu sslmode=disable",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue