Fix unit tests on Darwin (influxdata#4458)

MrMaxBuilds · danielnelson · commit 96cb0aaea02d · 2018-07-27T18:29:54.000-07:00
diff --git a/plugins/inputs/http_listener/http_listener_test.go b/plugins/inputs/http_listener/http_listener_test.go
@@ -336,7 +336,7 @@ func TestWriteHTTPGzippedData(t *testing.T) {
 
 // writes 25,000 metrics to the listener with 10 different writers
 func TestWriteHTTPHighTraffic(t *testing.T) {
-	if runtime.GOOS != "darwin" {
+	if runtime.GOOS == "darwin" {
 		t.Skip("Skipping due to hang on darwin")
 	}
 	listener := newTestHTTPListener()
diff --git a/plugins/inputs/http_response/http_response_test.go b/plugins/inputs/http_response/http_response_test.go
@@ -662,10 +662,10 @@ func TestNetworkErrors(t *testing.T) {
 
 	// Connecton failed
 	h = &HTTPResponse{
-		Address:         "https://127.127.127.127", // Any non-routable IP works here
+		Address:         "https:/nonexistent.nonexistent", // Any non-routable IP works here
 		Body:            "",
 		Method:          "GET",
-		ResponseTimeout: internal.Duration{Duration: time.Second * 20},
+		ResponseTimeout: internal.Duration{Duration: time.Second * 5},
 		FollowRedirects: false,
 	}
 
diff --git a/plugins/inputs/ping/ping.go b/plugins/inputs/ping/ping.go
@@ -94,7 +94,7 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {
 				return
 			}
 
-			args := p.args(u)
+			args := p.args(u, runtime.GOOS)
 			totalTimeout := float64(p.Count)*p.Timeout + float64(p.Count-1)*p.PingInterval
 
 			out, err := p.pingHost(totalTimeout, args...)
@@ -167,14 +167,14 @@ func hostPinger(timeout float64, args ...string) (string, error) {
 }
 
 // args returns the arguments for the 'ping' executable
-func (p *Ping) args(url string) []string {
+func (p *Ping) args(url string, system string) []string {
 	// Build the ping command args based on toml config
 	args := []string{"-c", strconv.Itoa(p.Count), "-n", "-s", "16"}
 	if p.PingInterval > 0 {
 		args = append(args, "-i", strconv.FormatFloat(p.PingInterval, 'f', -1, 64))
 	}
 	if p.Timeout > 0 {
-		switch runtime.GOOS {
+		switch system {
 		case "darwin", "freebsd", "netbsd", "openbsd":
 			args = append(args, "-W", strconv.FormatFloat(p.Timeout*1000, 'f', -1, 64))
 		case "linux":
@@ -185,7 +185,7 @@ func (p *Ping) args(url string) []string {
 		}
 	}
 	if p.Deadline > 0 {
-		switch runtime.GOOS {
+		switch system {
 		case "darwin", "freebsd", "netbsd", "openbsd":
 			args = append(args, "-t", strconv.Itoa(p.Deadline))
 		case "linux":
@@ -196,7 +196,7 @@ func (p *Ping) args(url string) []string {
 		}
 	}
 	if p.Interface != "" {
-		switch runtime.GOOS {
+		switch system {
 		case "darwin", "freebsd", "netbsd", "openbsd":
 			args = append(args, "-S", p.Interface)
 		case "linux":
diff --git a/plugins/inputs/ping/ping_test.go b/plugins/inputs/ping/ping_test.go
@@ -5,12 +5,12 @@ package ping
 import (
 	"errors"
 	"reflect"
-	"runtime"
 	"sort"
 	"testing"
 
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 // BSD/Darwin ping output
@@ -99,68 +99,29 @@ func TestErrorProcessPingOutput(t *testing.T) {
 // Test that arg lists and created correctly
 func TestArgs(t *testing.T) {
 	p := Ping{
-		Count: 2,
+		Count:        2,
+		Interface:    "eth0",
+		Timeout:      12.0,
+		Deadline:     24,
+		PingInterval: 1.2,
 	}
 
-	// Actual and Expected arg lists must be sorted for reflect.DeepEqual
-
-	actual := p.args("www.google.com")
-	expected := []string{"-c", "2", "-n", "-s", "16", "www.google.com"}
-	sort.Strings(actual)
-	sort.Strings(expected)
-	assert.True(t, reflect.DeepEqual(expected, actual),
-		"Expected: %s Actual: %s", expected, actual)
-
-	p.Interface = "eth0"
-	actual = p.args("www.google.com")
-	expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0",
-		"www.google.com"}
-	sort.Strings(actual)
-	sort.Strings(expected)
-	assert.True(t, reflect.DeepEqual(expected, actual),
-		"Expected: %s Actual: %s", expected, actual)
-
-	p.Timeout = 12.0
-	actual = p.args("www.google.com")
-	switch runtime.GOOS {
-	case "darwin":
-		expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0", "-W",
-			"12000.0", "www.google.com"}
-	default:
-		expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0", "-W",
-			"12", "www.google.com"}
-	}
-
-	p.Deadline = 24
-	actual = p.args("www.google.com")
-	switch runtime.GOOS {
-	case "darwin":
-		expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0", "-W",
-			"12000.0", "-t", "24", "www.google.com"}
-	default:
-		expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0", "-W",
-			"12", "-w", "24", "www.google.com"}
+	var systemCases = []struct {
+		system string
+		output []string
+	}{
+		{"darwin", []string{"-c", "2", "-n", "-s", "16", "-i", "1.2", "-W", "12000", "-t", "24", "-S", "eth0", "www.google.com"}},
+		{"linux", []string{"-c", "2", "-n", "-s", "16", "-i", "1.2", "-W", "12", "-w", "24", "-I", "eth0", "www.google.com"}},
+		{"anything else", []string{"-c", "2", "-n", "-s", "16", "-i", "1.2", "-W", "12", "-w", "24", "-I", "eth0", "www.google.com"}},
 	}
-
-	sort.Strings(actual)
-	sort.Strings(expected)
-	assert.True(t, reflect.DeepEqual(expected, actual),
-		"Expected: %s Actual: %s", expected, actual)
-
-	p.PingInterval = 1.2
-	actual = p.args("www.google.com")
-	switch runtime.GOOS {
-	case "darwin":
-		expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0", "-W",
-			"12000.0", "-t", "24", "-i", "1.2", "www.google.com"}
-	default:
-		expected = []string{"-c", "2", "-n", "-s", "16", "-I", "eth0", "-W",
-			"12", "-w", "24", "-i", "1.2", "www.google.com"}
+	for i := range systemCases {
+		actual := p.args("www.google.com", systemCases[i].system)
+		expected := systemCases[i].output
+		sort.Strings(actual)
+		sort.Strings(expected)
+		require.True(t, reflect.DeepEqual(expected, actual),
+			"Expected: %s Actual: %s", expected, actual)
 	}
-	sort.Strings(actual)
-	sort.Strings(expected)
-	assert.True(t, reflect.DeepEqual(expected, actual),
-		"Expected: %s Actual: %s", expected, actual)
 }
 
 func mockHostPinger(timeout float64, args ...string) (string, error) {
diff --git a/plugins/inputs/socket_listener/socket_listener_test.go b/plugins/inputs/socket_listener/socket_listener_test.go
@@ -55,7 +55,7 @@ func TestSocketListener_unix_tls(t *testing.T) {
 	tmpdir, err := ioutil.TempDir("", "telegraf")
 	require.NoError(t, err)
 	defer os.RemoveAll(tmpdir)
-	sock := filepath.Join(tmpdir, "socket_listener.TestSocketListener_unix_tls.sock")
+	sock := filepath.Join(tmpdir, "sl.TestSocketListener_unix_tls.sock")
 
 	sl := newSocketListener()
 	sl.ServiceAddress = "unix://" + sock
@@ -116,7 +116,7 @@ func TestSocketListener_unix(t *testing.T) {
 	tmpdir, err := ioutil.TempDir("", "telegraf")
 	require.NoError(t, err)
 	defer os.RemoveAll(tmpdir)
-	sock := filepath.Join(tmpdir, "socket_listener.TestSocketListener_unix.sock")
+	sock := filepath.Join(tmpdir, "sl.TestSocketListener_unix.sock")
 
 	defer testEmptyLog(t)()
 
@@ -140,7 +140,7 @@ func TestSocketListener_unixgram(t *testing.T) {
 	tmpdir, err := ioutil.TempDir("", "telegraf")
 	require.NoError(t, err)
 	defer os.RemoveAll(tmpdir)
-	sock := filepath.Join(tmpdir, "socket_listener.TestSocketListener_unixgram.sock")
+	sock := filepath.Join(tmpdir, "sl.TestSocketListener_unixgram.sock")
 
 	defer testEmptyLog(t)()
 
diff --git a/plugins/inputs/syslog/rfc5425_test.go b/plugins/inputs/syslog/rfc5425_test.go
@@ -403,13 +403,16 @@ func testStrictRFC5425(t *testing.T, protocol string, address string, wantTLS bo
 			acc.Errors = make([]error, 0)
 
 			// Write
-			conn.Write(tc.data)
+			_, err = conn.Write(tc.data)
+			conn.Close()
+			require.NoError(t, err)
 
 			// Wait that the the number of data points is accumulated
 			// Since the receiver is running concurrently
 			if tc.wantStrict != nil {
 				acc.Wait(len(tc.wantStrict))
 			}
+
 			// Wait the parsing error
 			acc.WaitError(tc.werr)
 
@@ -452,7 +455,6 @@ func testBestEffortRFC5425(t *testing.T, protocol string, address string, wantTL
 				conn, err = tls.Dial(protocol, address, config)
 			} else {
 				conn, err = net.Dial(protocol, address)
-				defer conn.Close()
 			}
 			require.NotNil(t, conn)
 			require.NoError(t, err)
@@ -462,7 +464,9 @@ func testBestEffortRFC5425(t *testing.T, protocol string, address string, wantTL
 			acc.Errors = make([]error, 0)
 
 			// Write
-			conn.Write(tc.data)
+			_, err = conn.Write(tc.data)
+			require.NoError(t, err)
+			conn.Close()
 
 			// Wait that the the number of data points is accumulated
 			// Since the receiver is running concurrently
diff --git a/plugins/inputs/syslog/rfc5426_test.go b/plugins/inputs/syslog/rfc5426_test.go
@@ -234,12 +234,18 @@ func testRFC5426(t *testing.T, protocol string, address string, bestEffort bool)
 			// Connect
 			conn, err := net.Dial(protocol, address)
 			require.NotNil(t, conn)
-			defer conn.Close()
 			require.Nil(t, err)
 
 			// Write
-			_, e := conn.Write(tc.data)
-			require.Nil(t, e)
+			_, err = conn.Write(tc.data)
+			conn.Close()
+			if err != nil {
+				if err, ok := err.(*net.OpError); ok {
+					if err.Err.Error() == "write: message too long" {
+						return
+					}
+				}
+			}
 
 			// Waiting ...
 			if tc.wantStrict == nil && tc.werr || bestEffort && tc.werr {
diff --git a/plugins/outputs/influxdb/udp_test.go b/plugins/outputs/influxdb/udp_test.go
@@ -202,7 +202,7 @@ func TestUDP_SerializeError(t *testing.T) {
 }
 
 func TestUDP_WriteWithRealConn(t *testing.T) {
-	conn, err := net.ListenPacket("udp", "127.0.0.0:0")
+	conn, err := net.ListenPacket("udp", "127.0.0.1:0")
 	require.NoError(t, err)
 
 	metrics := []telegraf.Metric{
diff --git a/plugins/outputs/socket_writer/socket_writer_test.go b/plugins/outputs/socket_writer/socket_writer_test.go
@@ -49,7 +49,7 @@ func TestSocketWriter_unix(t *testing.T) {
 	tmpdir, err := ioutil.TempDir("", "telegraf")
 	require.NoError(t, err)
 	defer os.RemoveAll(tmpdir)
-	sock := filepath.Join(tmpdir, "socket_writer.TestSocketWriter_unix.sock")
+	sock := filepath.Join(tmpdir, "sw.TestSocketWriter_unix.sock")
 
 	listener, err := net.Listen("unix", sock)
 	require.NoError(t, err)
@@ -70,7 +70,7 @@ func TestSocketWriter_unixgram(t *testing.T) {
 	tmpdir, err := ioutil.TempDir("", "telegraf")
 	require.NoError(t, err)
 	defer os.RemoveAll(tmpdir)
-	sock := filepath.Join(tmpdir, "socket_writer.TestSocketWriter_unixgram.sock")
+	sock := filepath.Join(tmpdir, "sw.TSW_unixgram.sock")
 
 	listener, err := net.ListenPacket("unixgram", sock)
 	require.NoError(t, err)

Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ func TestWriteHTTPGzippedData(t *testing.T) {`
`336`	`336`
`337`	`337`	`// writes 25,000 metrics to the listener with 10 different writers`
`338`	`338`	`func TestWriteHTTPHighTraffic(t *testing.T) {`
`339`		`- if runtime.GOOS != "darwin" {`
	`339`	`+ if runtime.GOOS == "darwin" {`
`340`	`340`	`t.Skip("Skipping due to hang on darwin")`
`341`	`341`	`}`
`342`	`342`	`listener := newTestHTTPListener()`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ func (p *Ping) Gather(acc telegraf.Accumulator) error {`
`94`	`94`	`return`
`95`	`95`	`}`
`96`	`96`
`97`		`- args := p.args(u)`
	`97`	`+ args := p.args(u, runtime.GOOS)`
`98`	`98`	`totalTimeout := float64(p.Count)p.Timeout + float64(p.Count-1)p.PingInterval`
`99`	`99`
`100`	`100`	`out, err := p.pingHost(totalTimeout, args...)`
`@@ -167,14 +167,14 @@ func hostPinger(timeout float64, args ...string) (string, error) {`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`// args returns the arguments for the 'ping' executable`
`170`		`-func (p *Ping) args(url string) []string {`
	`170`	`+func (p *Ping) args(url string, system string) []string {`
`171`	`171`	`// Build the ping command args based on toml config`
`172`	`172`	`args := []string{"-c", strconv.Itoa(p.Count), "-n", "-s", "16"}`
`173`	`173`	`if p.PingInterval > 0 {`
`174`	`174`	`args = append(args, "-i", strconv.FormatFloat(p.PingInterval, 'f', -1, 64))`
`175`	`175`	`}`
`176`	`176`	`if p.Timeout > 0 {`
`177`		`- switch runtime.GOOS {`
	`177`	`+ switch system {`
`178`	`178`	`case "darwin", "freebsd", "netbsd", "openbsd":`
`179`	`179`	`args = append(args, "-W", strconv.FormatFloat(p.Timeout*1000, 'f', -1, 64))`
`180`	`180`	`case "linux":`
`@@ -185,7 +185,7 @@ func (p *Ping) args(url string) []string {`
`185`	`185`	`}`
`186`	`186`	`}`
`187`	`187`	`if p.Deadline > 0 {`
`188`		`- switch runtime.GOOS {`
	`188`	`+ switch system {`
`189`	`189`	`case "darwin", "freebsd", "netbsd", "openbsd":`
`190`	`190`	`args = append(args, "-t", strconv.Itoa(p.Deadline))`
`191`	`191`	`case "linux":`
`@@ -196,7 +196,7 @@ func (p *Ping) args(url string) []string {`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`	`if p.Interface != "" {`
`199`		`- switch runtime.GOOS {`
	`199`	`+ switch system {`
`200`	`200`	`case "darwin", "freebsd", "netbsd", "openbsd":`
`201`	`201`	`args = append(args, "-S", p.Interface)`
`202`	`202`	`case "linux":`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ func TestUDP_SerializeError(t *testing.T) {`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`func TestUDP_WriteWithRealConn(t *testing.T) {`
`205`		`- conn, err := net.ListenPacket("udp", "127.0.0.0:0")`
	`205`	`+ conn, err := net.ListenPacket("udp", "127.0.0.1:0")`
`206`	`206`	`require.NoError(t, err)`
`207`	`207`
`208`	`208`	`metrics := []telegraf.Metric{`