From ae10fc7fb43ae96065f716a2c130e91676c34d02 Mon Sep 17 00:00:00 2001
From: gotyaoi <gotyaoi@hotmail.com>
Date: Fri, 16 Oct 2015 23:11:12 -0700
Subject: [PATCH] Fixing old tests and adding new ones for new code.
---
agent_test.go | 46 +++----
config_test.go | 260 ++++++++++++++++++++++++++++++++++++
testdata/single_plugin.toml | 12 ++
3 files changed, 295 insertions(+), 23 deletions(-)
create mode 100644 config_test.go
create mode 100644 testdata/single_plugin.toml
diff --git a/agent_test.go b/agent_test.go
index cb9847bb..691834ce 100644
--- a/agent_test.go
+++ b/agent_test.go
@@ -7,7 +7,7 @@ import (
// needing to load the plugins
_ "github.com/influxdb/telegraf/plugins/all"
// needing to load the outputs
- // _ "github.com/influxdb/telegraf/outputs/all"
+ _ "github.com/influxdb/telegraf/outputs/all"
)
func TestAgent_LoadPlugin(t *testing.T) {
@@ -16,46 +16,46 @@ func TestAgent_LoadPlugin(t *testing.T) {
config, _ := LoadConfig("./testdata/telegraf-agent.toml")
a, _ := NewAgent(config)
- pluginsEnabled, _ := a.LoadPlugins([]string{"mysql"})
+ pluginsEnabled, _ := a.LoadPlugins([]string{"mysql"}, config)
assert.Equal(t, 1, len(pluginsEnabled))
- pluginsEnabled, _ = a.LoadPlugins([]string{"foo"})
+ pluginsEnabled, _ = a.LoadPlugins([]string{"foo"}, config)
assert.Equal(t, 0, len(pluginsEnabled))
- pluginsEnabled, _ = a.LoadPlugins([]string{"mysql", "foo"})
+ pluginsEnabled, _ = a.LoadPlugins([]string{"mysql", "foo"}, config)
assert.Equal(t, 1, len(pluginsEnabled))
- pluginsEnabled, _ = a.LoadPlugins([]string{"mysql", "redis"})
+ pluginsEnabled, _ = a.LoadPlugins([]string{"mysql", "redis"}, config)
assert.Equal(t, 2, len(pluginsEnabled))
- pluginsEnabled, _ = a.LoadPlugins([]string{"mysql", "foo", "redis", "bar"})
+ pluginsEnabled, _ = a.LoadPlugins([]string{"mysql", "foo", "redis", "bar"}, config)
assert.Equal(t, 2, len(pluginsEnabled))
}
// TODO enable these unit tests, currently disabled because of a circular import
-// func TestAgent_LoadOutput(t *testing.T) {
-// // load a dedicated configuration file
-// config, _ := LoadConfig("./testdata/telegraf-agent.toml")
-// a, _ := NewAgent(config)
+func TestAgent_LoadOutput(t *testing.T) {
+ // load a dedicated configuration file
+ config, _ := LoadConfig("./testdata/telegraf-agent.toml")
+ a, _ := NewAgent(config)
-// outputsEnabled, _ := a.LoadOutputs([]string{"influxdb"})
-// assert.Equal(t, 1, len(outputsEnabled))
+ outputsEnabled, _ := a.LoadOutputs([]string{"influxdb"}, config)
+ assert.Equal(t, 1, len(outputsEnabled))
-// outputsEnabled, _ = a.LoadOutputs([]string{})
-// assert.Equal(t, 2, len(outputsEnabled))
+ outputsEnabled, _ = a.LoadOutputs([]string{}, config)
+ assert.Equal(t, 2, len(outputsEnabled))
-// outputsEnabled, _ = a.LoadOutputs([]string{"foo"})
-// assert.Equal(t, 0, len(outputsEnabled))
+ outputsEnabled, _ = a.LoadOutputs([]string{"foo"}, config)
+ assert.Equal(t, 0, len(outputsEnabled))
-// outputsEnabled, _ = a.LoadOutputs([]string{"influxdb", "foo"})
-// assert.Equal(t, 1, len(outputsEnabled))
+ outputsEnabled, _ = a.LoadOutputs([]string{"influxdb", "foo"}, config)
+ assert.Equal(t, 1, len(outputsEnabled))
-// outputsEnabled, _ = a.LoadOutputs([]string{"influxdb", "kafka"})
-// assert.Equal(t, 2, len(outputsEnabled))
+ outputsEnabled, _ = a.LoadOutputs([]string{"influxdb", "kafka"}, config)
+ assert.Equal(t, 2, len(outputsEnabled))
-// outputsEnabled, _ = a.LoadOutputs([]string{"influxdb", "foo", "kafka", "bar"})
-// assert.Equal(t, 2, len(outputsEnabled))
-// }
+ outputsEnabled, _ = a.LoadOutputs([]string{"influxdb", "foo", "kafka", "bar"}, config)
+ assert.Equal(t, 2, len(outputsEnabled))
+}
/*
func TestAgent_DrivesMetrics(t *testing.T) {
diff --git a/config_test.go b/config_test.go
new file mode 100644
index 00000000..c5f07d8a
--- /dev/null
+++ b/config_test.go
@@ -0,0 +1,260 @@
+package telegraf
+
+import (
+ "fmt"
+ "io/ioutil"
+ "testing"
+ "time"
+
+ "github.com/influxdb/telegraf/plugins"
+ "github.com/influxdb/telegraf/plugins/kafka_consumer"
+ "github.com/naoina/toml"
+ "github.com/naoina/toml/ast"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/suite"
+)
+
+func TestConfig_fieldMatch(t *testing.T) {
+ assert := assert.New(t)
+
+ matchFunc := fieldMatch("testfield")
+ assert.True(matchFunc("testField"), "testfield should match testField")
+ assert.True(matchFunc("TestField"), "testfield should match TestField")
+ assert.True(matchFunc("TESTFIELD"), "testfield should match TESTFIELD")
+ assert.False(matchFunc("OtherField"), "testfield should not match OtherField")
+
+ matchFunc = fieldMatch("test_field")
+ assert.True(matchFunc("testField"), "test_field should match testField")
+ assert.True(matchFunc("TestField"), "test_field should match TestField")
+ assert.True(matchFunc("TESTFIELD"), "test_field should match TESTFIELD")
+ assert.False(matchFunc("OtherField"), "test_field should not match OtherField")
+}
+
+type subTest struct {
+ AField string
+ AnotherField int
+}
+type test struct {
+ StringField string
+ IntegerField int
+ FloatField float32
+ BooleanField bool
+ DatetimeField time.Time
+ ArrayField []string
+ TableArrayField []subTest
+}
+
+type MergeStructSuite struct {
+ suite.Suite
+ EmptyStruct *test
+ FullStruct *test
+ AnotherFullStruct *test
+ AllFields []string
+}
+
+func (s *MergeStructSuite) SetupSuite() {
+ s.AllFields = []string{"string_field", "integer_field", "float_field", "boolean_field", "date_time_field", "array_field", "table_array_field"}
+}
+
+func (s *MergeStructSuite) SetupTest() {
+ s.EmptyStruct = &test{
+ ArrayField: []string{},
+ TableArrayField: []subTest{},
+ }
+ s.FullStruct = &test{
+ StringField: "one",
+ IntegerField: 1,
+ FloatField: 1.1,
+ BooleanField: false,
+ DatetimeField: time.Date(1963, time.August, 28, 17, 0, 0, 0, time.UTC),
+ ArrayField: []string{"one", "two", "three"},
+ TableArrayField: []subTest{
+ subTest{
+ AField: "one",
+ AnotherField: 1,
+ },
+ subTest{
+ AField: "two",
+ AnotherField: 2,
+ },
+ },
+ }
+ s.AnotherFullStruct = &test{
+ StringField: "two",
+ IntegerField: 2,
+ FloatField: 2.2,
+ BooleanField: true,
+ DatetimeField: time.Date(1965, time.March, 25, 17, 0, 0, 0, time.UTC),
+ ArrayField: []string{"four", "five", "six"},
+ TableArrayField: []subTest{
+ subTest{
+ AField: "three",
+ AnotherField: 3,
+ },
+ subTest{
+ AField: "four",
+ AnotherField: 4,
+ },
+ },
+ }
+}
+
+func (s *MergeStructSuite) TestEmptyMerge() {
+ err := mergeStruct(s.EmptyStruct, s.FullStruct, s.AllFields)
+ if err != nil {
+ s.T().Error(err)
+ }
+ s.Equal(s.FullStruct, s.EmptyStruct, fmt.Sprintf("Full merge of %v onto an empty struct failed.", s.FullStruct))
+}
+
+func (s *MergeStructSuite) TestFullMerge() {
+ result := &test{
+ StringField: "two",
+ IntegerField: 2,
+ FloatField: 2.2,
+ BooleanField: true,
+ DatetimeField: time.Date(1965, time.March, 25, 17, 0, 0, 0, time.UTC),
+ ArrayField: []string{"one", "two", "three", "four", "five", "six"},
+ TableArrayField: []subTest{
+ subTest{
+ AField: "one",
+ AnotherField: 1,
+ },
+ subTest{
+ AField: "two",
+ AnotherField: 2,
+ },
+ subTest{
+ AField: "three",
+ AnotherField: 3,
+ },
+ subTest{
+ AField: "four",
+ AnotherField: 4,
+ },
+ },
+ }
+
+ err := mergeStruct(s.FullStruct, s.AnotherFullStruct, s.AllFields)
+ if err != nil {
+ s.T().Error(err)
+ }
+ s.Equal(result, s.FullStruct, fmt.Sprintf("Full merge of %v onto FullStruct failed.", s.AnotherFullStruct))
+ s.T().Log("hi")
+}
+
+func (s *MergeStructSuite) TestPartialMergeWithoutSlices() {
+ result := &test{
+ StringField: "two",
+ IntegerField: 1,
+ FloatField: 2.2,
+ BooleanField: false,
+ DatetimeField: time.Date(1965, time.March, 25, 17, 0, 0, 0, time.UTC),
+ ArrayField: []string{"one", "two", "three"},
+ TableArrayField: []subTest{
+ subTest{
+ AField: "one",
+ AnotherField: 1,
+ },
+ subTest{
+ AField: "two",
+ AnotherField: 2,
+ },
+ },
+ }
+
+ err := mergeStruct(s.FullStruct, s.AnotherFullStruct, []string{"string_field", "float_field", "date_time_field"})
+ if err != nil {
+ s.T().Error(err)
+ }
+ s.Equal(result, s.FullStruct, fmt.Sprintf("Partial merge without slices of %v onto FullStruct failed.", s.AnotherFullStruct))
+}
+
+func (s *MergeStructSuite) TestPartialMergeWithSlices() {
+ result := &test{
+ StringField: "two",
+ IntegerField: 1,
+ FloatField: 2.2,
+ BooleanField: false,
+ DatetimeField: time.Date(1965, time.March, 25, 17, 0, 0, 0, time.UTC),
+ ArrayField: []string{"one", "two", "three"},
+ TableArrayField: []subTest{
+ subTest{
+ AField: "one",
+ AnotherField: 1,
+ },
+ subTest{
+ AField: "two",
+ AnotherField: 2,
+ },
+ subTest{
+ AField: "three",
+ AnotherField: 3,
+ },
+ subTest{
+ AField: "four",
+ AnotherField: 4,
+ },
+ },
+ }
+
+ err := mergeStruct(s.FullStruct, s.AnotherFullStruct, []string{"string_field", "float_field", "date_time_field", "table_array_field"})
+ if err != nil {
+ s.T().Error(err)
+ }
+ s.Equal(result, s.FullStruct, fmt.Sprintf("Partial merge with slices of %v onto FullStruct failed.", s.AnotherFullStruct))
+}
+
+func TestConfig_mergeStruct(t *testing.T) {
+ suite.Run(t, new(MergeStructSuite))
+}
+
+func TestConfig_parsePlugin(t *testing.T) {
+ data, err := ioutil.ReadFile("./testdata/single_plugin.toml")
+ if err != nil {
+ t.Error(err)
+ }
+
+ tbl, err := toml.Parse(data)
+ if err != nil {
+ t.Error(err)
+ }
+
+ c := &Config{
+ plugins: make(map[string]plugins.Plugin),
+ pluginConfigurations: make(map[string]*ConfiguredPlugin),
+ pluginFieldsSet: make(map[string][]string),
+ pluginConfigurationFieldsSet: make(map[string][]string),
+ }
+
+ subtbl := tbl.Fields["kafka"].(*ast.Table)
+ err = c.parsePlugin("kafka", subtbl)
+
+ kafka := plugins.Plugins["kafka"]().(*kafka_consumer.Kafka)
+ kafka.ConsumerGroupName = "telegraf_metrics_consumers"
+ kafka.Topic = "topic_with_metrics"
+ kafka.ZookeeperPeers = []string{"test.example.com:2181"}
+ kafka.BatchSize = 1000
+
+ pConfig := &ConfiguredPlugin{
+ Name: "kafka",
+ Drop: []string{"other", "stuff"},
+ Pass: []string{"some", "strings"},
+ TagDrop: []TagFilter{
+ TagFilter{
+ Name: "badtag",
+ Filter: []string{"othertag"},
+ },
+ },
+ TagPass: []TagFilter{
+ TagFilter{
+ Name: "goodtag",
+ Filter: []string{"mytag"},
+ },
+ },
+ Interval: 5 * time.Second,
+ }
+
+ assert.Equal(t, kafka, c.plugins["kafka"], "Testdata did not produce a correct kafka struct.")
+ assert.Equal(t, pConfig, c.pluginConfigurations["kafka"], "Testdata did not produce correct config metadata.")
+}
diff --git a/testdata/single_plugin.toml b/testdata/single_plugin.toml
new file mode 100644
index 00000000..b89cdebf
--- /dev/null
+++ b/testdata/single_plugin.toml
@@ -0,0 +1,12 @@
+[kafka]
+ topic = "topic_with_metrics"
+ consumerGroupName = "telegraf_metrics_consumers"
+ zookeeperPeers = ["test.example.com:2181"]
+ batchSize = 1000
+ pass = ["some", "strings"]
+ drop = ["other", "stuff"]
+ interval = "5s"
+ [kafka.tagpass]
+ goodtag = ["mytag"]
+ [kafka.tagdrop]
+ badtag = ["othertag"]
--
GitLab