Drop dependency on github.com/loadimpact/k6/stats/influxdb in tests as well (#3)

Author: mstoykov

pkg/kafka/collector_test.go

@@ -56,7 +56,6 @@ func TestRun(t *testing.T) {
 
 func TestFormatSamples(t *testing.T) {
 	c := Collector{}
-	c.Config.InfluxDBConfig.ConcurrentWrites = null.IntFrom(10)
 	metric := stats.New("my_metric", stats.Gauge)
 	samples := stats.Samples{
 		{Metric: metric, Value: 1.25, Tags: stats.IntoSampleTags(&map[string]string{"a": "1"})},

pkg/kafka/config.go

@@ -99,8 +99,9 @@ func ParseArg(arg string) (Config, error) {
 		if err != nil {
 			return c, err
 		}
-		c.InfluxDBConfig = influxConfig
+		c.InfluxDBConfig = c.InfluxDBConfig.Apply(influxConfig)
 	}
+
 	delete(params, "influxdb")
 
 	if v, ok := params["push_interval"].(string); ok {

pkg/kafka/config_test.go

@@ -31,12 +31,11 @@ import (
 	"gopkg.in/guregu/null.v3"
 
 	"github.com/loadimpact/k6/lib/types"
-	"github.com/loadimpact/k6/stats/influxdb"
 )
 
 func TestConfigParseArg(t *testing.T) {
 	c, err := ParseArg("brokers=broker1,topic=someTopic,format=influxdb")
-	expInfluxConfig := influxdb.Config{}
+	expInfluxConfig := influxdbConfig{}
 	assert.Nil(t, err)
 	assert.Equal(t, []string{"broker1"}, c.Brokers)
 	assert.Equal(t, null.StringFrom("someTopic"), c.Topic)
@@ -50,7 +49,7 @@ func TestConfigParseArg(t *testing.T) {
 	assert.Equal(t, null.StringFrom("json"), c.Format)
 
 	c, err = ParseArg("brokers={broker2,broker3:9092},topic=someTopic,format=influxdb,influxdb.tagsAsFields=fake")
-	expInfluxConfig = influxdb.Config{
+	expInfluxConfig = influxdbConfig{
 		TagsAsFields: []string{"fake"},
 	}
 	assert.Nil(t, err)
@@ -60,7 +59,7 @@ func TestConfigParseArg(t *testing.T) {
 	assert.Equal(t, expInfluxConfig, c.InfluxDBConfig)
 
 	c, err = ParseArg("brokers={broker2,broker3:9092},topic=someTopic,format=influxdb,influxdb.tagsAsFields={fake,anotherFake}")
-	expInfluxConfig = influxdb.Config{
+	expInfluxConfig = influxdbConfig{
 		TagsAsFields: []string{"fake", "anotherFake"},
 	}
 	assert.Nil(t, err)
@@ -84,18 +83,7 @@ func TestConsolidatedConfig(t *testing.T) {
 			config: Config{
 				Format:         null.StringFrom("json"),
 				PushInterval:   types.NullDurationFrom(1 * time.Second),
-				InfluxDBConfig: influxdb.NewConfig(),
-			},
-		},
-		"bad influxdb concurrent writes": {
-			env: map[string]string{"K6_INFLUXDB_CONCURRENT_WRITES": "-2"},
-			config: Config{
-				Format:       null.StringFrom("json"),
-				PushInterval: types.NullDurationFrom(1 * time.Second),
-				InfluxDBConfig: influxdb.NewConfig().Apply(
-					influxdb.Config{
-						ConcurrentWrites: null.IntFrom(-2),
-					}),
+				InfluxDBConfig: newInfluxdbConfig(),
 			},
 		},
 	}