0.3.0 unit tests: existing postgresql

This commit is contained in:
Donald Guy 2016-01-06 19:25:40 -05:00
parent 8e38f593c4
commit 4970e2a37b
1 changed files with 15 additions and 31 deletions

View File

@ -15,13 +15,9 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
} }
p := &Postgresql{ p := &Postgresql{
Servers: []*Server{ Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
{ testutil.GetLocalHost()),
Address: fmt.Sprintf("host=%s user=postgres sslmode=disable", Databases: []string{"postgres"},
testutil.GetLocalHost()),
Databases: []string{"postgres"},
},
},
} }
var acc testutil.Accumulator var acc testutil.Accumulator
@ -30,7 +26,7 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
availableColumns := make(map[string]bool) availableColumns := make(map[string]bool)
for _, col := range p.Servers[0].OrderedColumns { for _, col := range p.OrderedColumns {
availableColumns[col] = true availableColumns[col] = true
} }
@ -61,7 +57,7 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
for _, metric := range intMetrics { for _, metric := range intMetrics {
_, ok := availableColumns[metric] _, ok := availableColumns[metric]
if ok { if ok {
assert.True(t, acc.HasIntValue(metric)) assert.True(t, acc.HasIntField("postgresql", metric), metric)
metricsCounted++ metricsCounted++
} }
} }
@ -69,7 +65,7 @@ func TestPostgresqlGeneratesMetrics(t *testing.T) {
for _, metric := range floatMetrics { for _, metric := range floatMetrics {
_, ok := availableColumns[metric] _, ok := availableColumns[metric]
if ok { if ok {
assert.True(t, acc.HasFloatValue(metric)) assert.True(t, acc.HasFloatField("postgresql", metric), metric)
metricsCounted++ metricsCounted++
} }
} }
@ -84,13 +80,9 @@ func TestPostgresqlTagsMetricsWithDatabaseName(t *testing.T) {
} }
p := &Postgresql{ p := &Postgresql{
Servers: []*Server{ Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
{ testutil.GetLocalHost()),
Address: fmt.Sprintf("host=%s user=postgres sslmode=disable", Databases: []string{"postgres"},
testutil.GetLocalHost()),
Databases: []string{"postgres"},
},
},
} }
var acc testutil.Accumulator var acc testutil.Accumulator
@ -98,7 +90,7 @@ func TestPostgresqlTagsMetricsWithDatabaseName(t *testing.T) {
err := p.Gather(&acc) err := p.Gather(&acc)
require.NoError(t, err) require.NoError(t, err)
point, ok := acc.Get("xact_commit") point, ok := acc.Get("postgresql")
require.True(t, ok) require.True(t, ok)
assert.Equal(t, "postgres", point.Tags["db"]) assert.Equal(t, "postgres", point.Tags["db"])
@ -110,12 +102,8 @@ func TestPostgresqlDefaultsToAllDatabases(t *testing.T) {
} }
p := &Postgresql{ p := &Postgresql{
Servers: []*Server{ Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
{ testutil.GetLocalHost()),
Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
testutil.GetLocalHost()),
},
},
} }
var acc testutil.Accumulator var acc testutil.Accumulator
@ -126,7 +114,7 @@ func TestPostgresqlDefaultsToAllDatabases(t *testing.T) {
var found bool var found bool
for _, pnt := range acc.Points { for _, pnt := range acc.Points {
if pnt.Measurement == "xact_commit" { if pnt.Measurement == "postgresql" {
if pnt.Tags["db"] == "postgres" { if pnt.Tags["db"] == "postgres" {
found = true found = true
break break
@ -143,12 +131,8 @@ func TestPostgresqlIgnoresUnwantedColumns(t *testing.T) {
} }
p := &Postgresql{ p := &Postgresql{
Servers: []*Server{ Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
{ testutil.GetLocalHost()),
Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
testutil.GetLocalHost()),
},
},
} }
var acc testutil.Accumulator var acc testutil.Accumulator