Merge #304

304: remove windows check from sockets tests r=48d90782 a=48d90782

resolves #303 

Co-authored-by: Valery Piashchynski <[email protected]>

4 files changed, 0 insertions, 64 deletions

diff --git a/server_config_test.go b/server_config_test.go
index 303eba90..c88f9082 100644
--- a/server_config_test.go
+++ b/server_config_test.go
@@ -2,7 +2,6 @@ package roadrunner
 
 import (
 	"github.com/stretchr/testify/assert"
-	"runtime"
 	"testing"
 	"time"
 )
@@ -65,10 +64,6 @@ func Test_ServerConfig_SocketFactory(t *testing.T) {
 }
 
 func Test_ServerConfig_UnixSocketFactory(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("not supported on " + runtime.GOOS)
-	}
-
 	cfg := &ServerConfig{Relay: "unix://unix.sock"}
 	f, err := cfg.makeFactory()
 	if err != nil {
@@ -89,10 +84,6 @@ func Test_ServerConfig_UnixSocketFactory(t *testing.T) {
 }
 
 func Test_ServerConfig_ErrorFactory(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("not supported on " + runtime.GOOS)
-	}
-
 	cfg := &ServerConfig{Relay: "uni:unix.sock"}
 	f, err := cfg.makeFactory()
 	assert.Nil(t, f)
diff --git a/service/http/rpc_test.go b/service/http/rpc_test.go
index 9f56e2cd..e57a8699 100644
--- a/service/http/rpc_test.go
+++ b/service/http/rpc_test.go
@@ -8,7 +8,6 @@ import (
 	"github.com/spiral/roadrunner/service/rpc"
 	"github.com/stretchr/testify/assert"
 	"os"
-	"runtime"
 	"strconv"
 	"testing"
 	"time"
@@ -81,10 +80,6 @@ func Test_RPC(t *testing.T) {
 }
 
 func Test_RPC_Unix(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("not supported on " + runtime.GOOS)
-	}
-
 	logger, _ := test.NewNullLogger()
 	logger.SetLevel(logrus.DebugLevel)
 
diff --git a/service/rpc/config_test.go b/service/rpc/config_test.go
index 7a7ca13b..1ecd71b3 100644
--- a/service/rpc/config_test.go
+++ b/service/rpc/config_test.go
@@ -4,7 +4,6 @@ import (
 	json "github.com/json-iterator/go"
 	"github.com/spiral/roadrunner/service"
 	"github.com/stretchr/testify/assert"
-	"runtime"
 	"testing"
 )
 
@@ -55,10 +54,6 @@ func TestConfig_Listener(t *testing.T) {
 }
 
 func TestConfig_ListenerUnix(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("not supported on " + runtime.GOOS)
-	}
-
 	cfg := &Config{Listen: "unix://file.sock"}
 
 	ln, err := cfg.Listener()
@@ -76,10 +71,6 @@ func TestConfig_ListenerUnix(t *testing.T) {
 }
 
 func Test_Config_Error(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("not supported on " + runtime.GOOS)
-	}
-
 	cfg := &Config{Listen: "uni:unix.sock"}
 	ln, err := cfg.Listener()
 	assert.Nil(t, ln)
@@ -121,10 +112,6 @@ func TestConfig_Dialer(t *testing.T) {
 }
 
 func TestConfig_DialerUnix(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("not supported on " + runtime.GOOS)
-	}
-
 	cfg := &Config{Listen: "unix://file.sock"}
 
 	ln, _ := cfg.Listener()
@@ -150,10 +137,6 @@ func TestConfig_DialerUnix(t *testing.T) {
 }
 
 func Test_Config_DialerError(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("not supported on " + runtime.GOOS)
-	}
-
 	cfg := &Config{Listen: "uni:unix.sock"}
 	ln, err := cfg.Dialer()
 	assert.Nil(t, ln)
diff --git a/socket_factory_test.go b/socket_factory_test.go
index c15e720a..abb40f16 100644
--- a/socket_factory_test.go
+++ b/socket_factory_test.go
@@ -4,7 +4,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"net"
 	"os/exec"
-	"runtime"
 	"testing"
 	"time"
 )
@@ -243,10 +242,6 @@ func Test_Tcp_Echo(t *testing.T) {
 }
 
 func Test_Unix_Start(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("not supported on " + runtime.GOOS)
-	}
-
 	ls, err := net.Listen("unix", "sock.unix")
 	if err == nil {
 		defer func() {
@@ -276,10 +271,6 @@ func Test_Unix_Start(t *testing.T) {
 }
 
 func Test_Unix_Failboot(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("not supported on " + runtime.GOOS)
-	}
-
 	ls, err := net.Listen("unix", "sock.unix")
 	if err == nil {
 		defer func() {
@@ -301,10 +292,6 @@ func Test_Unix_Failboot(t *testing.T) {
 }
 
 func Test_Unix_Timeout(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("not supported on " + runtime.GOOS)
-	}
-
 	ls, err := net.Listen("unix", "sock.unix")
 	if err == nil {
 		defer func() {
@@ -326,10 +313,6 @@ func Test_Unix_Timeout(t *testing.T) {
 }
 
 func Test_Unix_Invalid(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("not supported on " + runtime.GOOS)
-	}
-
 	ls, err := net.Listen("unix", "sock.unix")
 	if err == nil {
 		defer func() {
@@ -350,10 +333,6 @@ func Test_Unix_Invalid(t *testing.T) {
 }
 
 func Test_Unix_Broken(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("not supported on " + runtime.GOOS)
-	}
-
 	ls, err := net.Listen("unix", "sock.unix")
 	if err == nil {
 		defer func() {
@@ -388,10 +367,6 @@ func Test_Unix_Broken(t *testing.T) {
 }
 
 func Test_Unix_Echo(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("not supported on " + runtime.GOOS)
-	}
-
 	ls, err := net.Listen("unix", "sock.unix")
 	if err == nil {
 		defer func() {
@@ -495,10 +470,6 @@ func Benchmark_Tcp_Worker_ExecEcho(b *testing.B) {
 }
 
 func Benchmark_Unix_SpawnWorker_Stop(b *testing.B) {
-	if runtime.GOOS == "windows" {
-		b.Skip("not supported on " + runtime.GOOS)
-	}
-
 	ls, err := net.Listen("unix", "sock.unix")
 	if err == nil {
 		defer func() {
@@ -530,10 +501,6 @@ func Benchmark_Unix_SpawnWorker_Stop(b *testing.B) {
 }
 
 func Benchmark_Unix_Worker_ExecEcho(b *testing.B) {
-	if runtime.GOOS == "windows" {
-		b.Skip("not supported on " + runtime.GOOS)
-	}
-
 	ls, err := net.Listen("unix", "sock.unix")
 	if err == nil {
 		defer func() {