Fix tests for Windows - part 1 (enable tests for syslog plugin)

plugins/inputs/syslog/commons_test.go

@@ -1,7 +1,3 @@
-//+build !windows
-
-// TODO: Windows - should be enabled for Windows when tests are ready for this OS
-
 package syslog
 
 import (

plugins/inputs/syslog/nontransparent_test.go

@@ -1,7 +1,3 @@
-//+build !windows
-
-// TODO: Windows - should be enabled for Windows when tests are ready for this OS
-
 package syslog
 
 import (
@@ -13,11 +9,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	framing "github.com/influxdata/telegraf/internal/syslog"
 	"github.com/influxdata/telegraf/testutil"
-	"github.com/stretchr/testify/require"
 )
 
 func getTestCasesForNonTransparent() []testCaseStream {

plugins/inputs/syslog/octetcounting_test.go

@@ -1,7 +1,3 @@
-//+build !windows
-
-// TODO: Windows - should be enabled for Windows when tests are ready for this OS
-
 package syslog
 
 import (
@@ -14,11 +10,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	framing "github.com/influxdata/telegraf/internal/syslog"
 	"github.com/influxdata/telegraf/testutil"
-	"github.com/stretchr/testify/require"
 )
 
 func getTestCasesForOctetCounting() []testCaseStream {

plugins/inputs/syslog/rfc5426_test.go

@@ -1,7 +1,3 @@
-//+build !windows
-
-// TODO: Windows - should be enabled for Windows when tests are ready for this OS
-
 package syslog
 
 import (
@@ -10,13 +6,15 @@ import (
 	"net"
 	"os"
 	"path/filepath"
+	"runtime"
 	"sync/atomic"
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/testutil"
-	"github.com/stretchr/testify/require"
 )
 
 func getTestCasesForRFC5426() []testCasePacket {
@@ -288,6 +286,10 @@ func TestStrict_udp(t *testing.T) {
 }
 
 func TestBestEffort_unixgram(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		t.Skip("Skipping on Windows, as unixgram sockets are not supported")
+	}
+
 	tmpdir, err := ioutil.TempDir("", "telegraf")
 	require.NoError(t, err)
 	defer os.RemoveAll(tmpdir)
@@ -297,6 +299,10 @@ func TestBestEffort_unixgram(t *testing.T) {
 }
 
 func TestStrict_unixgram(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		t.Skip("Skipping on Windows, as unixgram sockets are not supported")
+	}
+
 	tmpdir, err := ioutil.TempDir("", "telegraf")
 	require.NoError(t, err)
 	defer os.RemoveAll(tmpdir)

plugins/inputs/syslog/syslog.go

@@ -7,6 +7,7 @@ import (
 	"net"
 	"net/url"
 	"os"
+	"path/filepath"
 	"strings"
 	"sync"
 	"time"
@@ -16,6 +17,7 @@ import (
 	"github.com/influxdata/go-syslog/v2/nontransparent"
 	"github.com/influxdata/go-syslog/v2/octetcounting"
 	"github.com/influxdata/go-syslog/v2/rfc5424"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	framing "github.com/influxdata/telegraf/internal/syslog"
@@ -195,7 +197,10 @@ func getAddressParts(a string) (string, string, error) {
 		return "", "", fmt.Errorf("missing protocol within address '%s'", a)
 	}
 
-	u, _ := url.Parse(a)
+	u, err := url.Parse(filepath.ToSlash(a)) //convert backslashes to slashes (to make Windows path a valid URL)
+	if err != nil {
+		return "", "", fmt.Errorf("could not parse address '%s': %v", a, err)
+	}
 	switch u.Scheme {
 	case "unix", "unixpacket", "unixgram":
 		return parts[0], parts[1], nil

plugins/inputs/syslog/syslog_test.go

@@ -1,19 +1,17 @@
-//+build !windows
-
-// TODO: Windows - should be enabled for Windows when tests are ready for this OS
-
 package syslog
 
 import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"testing"
 	"time"
 
-	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/require"
+
+	"github.com/influxdata/telegraf/testutil"
 )
 
 const (
@@ -53,13 +51,16 @@ func TestAddress(t *testing.T) {
 	require.NoError(t, err)
 	sock := filepath.Join(tmpdir, "syslog.TestAddress.sock")
 
-	rec = &Syslog{
-		Address: "unixgram://" + sock,
+	if runtime.GOOS != "windows" {
+		// Skipping on Windows, as unixgram sockets are not supported
+		rec = &Syslog{
+			Address: "unixgram://" + sock,
+		}
+		err = rec.Start(&testutil.Accumulator{})
+		require.NoError(t, err)
+		require.Equal(t, sock, rec.Address)
+		rec.Stop()
 	}
-	err = rec.Start(&testutil.Accumulator{})
-	require.NoError(t, err)
-	require.Equal(t, sock, rec.Address)
-	rec.Stop()
 
 	// Default port is 6514
 	rec = &Syslog{