dom/telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Test using Go 1.8-1.10; official builds with 1.10 (#4041)

Browse Source
This commit is contained in:
Daniel Nelson
2018-04-18 16:14:06 -07:00
committed by GitHub
parent 571ce86d10
commit 78d4a95ce6
6 changed files with 89 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/inputs/statsd/statsd_test.go
View File

@@ -59,7 +59,7 @@ func TestConcurrentConns(t *testing.T) {
require.NoError(t, listener.Start(acc))
defer listener.Stop()
time.Sleep(time.Millisecond * 25)
time.Sleep(time.Millisecond * 250)
_, err := net.Dial("tcp", "127.0.0.1:8125")
assert.NoError(t, err)
_, err = net.Dial("tcp", "127.0.0.1:8125")
@@ -72,7 +72,7 @@ func TestConcurrentConns(t *testing.T) {
assert.NoError(t, err)
_, err = conn.Write([]byte(testMsg))
assert.NoError(t, err)
time.Sleep(time.Millisecond * 10)
time.Sleep(time.Millisecond * 100)
assert.Zero(t, acc.NFields())
}
@@ -89,7 +89,7 @@ func TestConcurrentConns1(t *testing.T) {
require.NoError(t, listener.Start(acc))
defer listener.Stop()
time.Sleep(time.Millisecond * 25)
time.Sleep(time.Millisecond * 250)
_, err := net.Dial("tcp", "127.0.0.1:8125")
assert.NoError(t, err)
@@ -100,7 +100,7 @@ func TestConcurrentConns1(t *testing.T) {
assert.NoError(t, err)
_, err = conn.Write([]byte(testMsg))
assert.NoError(t, err)
time.Sleep(time.Millisecond * 10)
time.Sleep(time.Millisecond * 100)
assert.Zero(t, acc.NFields())
}
@@ -116,7 +116,7 @@ func TestCloseConcurrentConns(t *testing.T) {
acc := &testutil.Accumulator{}
require.NoError(t, listener.Start(acc))
time.Sleep(time.Millisecond * 25)
time.Sleep(time.Millisecond * 250)
_, err := net.Dial("tcp", "127.0.0.1:8125")
assert.NoError(t, err)
_, err = net.Dial("tcp", "127.0.0.1:8125")
@@ -141,7 +141,7 @@ func BenchmarkUDP(b *testing.B) {
panic(err)
}
time.Sleep(time.Millisecond * 25)
time.Sleep(time.Millisecond * 250)
conn, err := net.Dial("udp", "127.0.0.1:8125")
if err != nil {
panic(err)
@@ -172,7 +172,7 @@ func BenchmarkTCP(b *testing.B) {
panic(err)
}
time.Sleep(time.Millisecond * 25)
time.Sleep(time.Millisecond * 250)
conn, err := net.Dial("tcp", "127.0.0.1:8125")
if err != nil {
panic(err)

7
plugins/inputs/zipkin/zipkin.go
View File

@@ -29,6 +29,11 @@ const (
DefaultShutdownTimeout = 5
)
var (
// DefaultNetwork is the network to listen on; use only in tests.
DefaultNetwork = "tcp"
)
// Recorder represents a type which can record zipkin trace data as well as
// any accompanying errors, and process that data.
type Recorder interface {
@@ -94,7 +99,7 @@ func (z *Zipkin) Start(acc telegraf.Accumulator) error {
}
addr := ":" + strconv.Itoa(z.Port)
ln, err := net.Listen("tcp", addr)
ln, err := net.Listen(DefaultNetwork, addr)
if err != nil {
return err
}

4
plugins/inputs/zipkin/zipkin_test.go
View File

@@ -557,6 +557,10 @@ func TestZipkinPlugin(t *testing.T) {
},
}
// Workaround for Go 1.8
// https://github.com/golang/go/issues/18806
DefaultNetwork = "tcp4"
z := &Zipkin{
Path: "/api/v1/spans",
Port: 0,

2
plugins/outputs/influxdb/udp_test.go
View File

@@ -197,7 +197,7 @@ func TestUDP_SerializeError(t *testing.T) {
}
func TestUDP_WriteWithRealConn(t *testing.T) {
conn, err := net.ListenPacket("udp", ":0")
conn, err := net.ListenPacket("udp", "127.0.0.0:0")
require.NoError(t, err)
metrics := []telegraf.Metric{