0.3.0 unit tests: mysql, nginx, phpfpm, ping, postgres

plugins/mysql/mysql_test.go

@@ -2,7 +2,6 @@ package mysql
 
 import (
 	"fmt"
-	"strings"
 	"testing"
 
 	"github.com/influxdb/telegraf/testutil"
@@ -10,64 +9,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestMysqlGeneratesMetrics(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping integration test in short mode")
-	}
-
-	m := &Mysql{
-		Servers: []string{fmt.Sprintf("root@tcp(%s:3306)/", testutil.GetLocalHost())},
-	}
-
-	var acc testutil.Accumulator
-
-	err := m.Gather(&acc)
-	require.NoError(t, err)
-
-	prefixes := []struct {
-		prefix string
-		count  int
-	}{
-		{"commands", 139},
-		{"handler", 16},
-		{"bytes", 2},
-		{"innodb", 46},
-		{"threads", 4},
-		{"aborted", 2},
-		{"created", 3},
-		{"key", 7},
-		{"open", 7},
-		{"opened", 3},
-		{"qcache", 8},
-		{"table", 1},
-	}
-
-	intMetrics := []string{
-		"queries",
-		"slow_queries",
-		"connections",
-	}
-
-	for _, prefix := range prefixes {
-		var count int
-
-		for _, p := range acc.Points {
-			if strings.HasPrefix(p.Measurement, prefix.prefix) {
-				count++
-			}
-		}
-
-		if prefix.count > count {
-			t.Errorf("Expected less than %d measurements with prefix %s, got %d",
-				count, prefix.prefix, prefix.count)
-		}
-	}
-
-	for _, metric := range intMetrics {
-		assert.True(t, acc.HasIntValue(metric))
-	}
-}
-
 func TestMysqlDefaultsToLocal(t *testing.T) {
 	if testing.Short() {
 		t.Skip("Skipping integration test in short mode")
@@ -82,7 +23,7 @@ func TestMysqlDefaultsToLocal(t *testing.T) {
 	err := m.Gather(&acc)
 	require.NoError(t, err)
 
-	assert.True(t, len(acc.Points) > 0)
+	assert.True(t, acc.HasMeasurement("mysql"))
 }
 
 func TestMysqlParseDSN(t *testing.T) {