diff --git a/context_test.go b/context_test.go index 66a55cd2..ae0d882d 100644 --- a/context_test.go +++ b/context_test.go @@ -271,7 +271,7 @@ func TestContextHandlerName(t *testing.T) { c, _ := CreateTestContext(httptest.NewRecorder()) c.handlers = HandlersChain{func(c *Context) {}, handlerNameTest} - assert.Regexp(t, "^(.*/vendor/)?github.com/gin-gonic/gin.handlerNameTest$", c.HandlerName()) + assert.Regexp(t, "^(.*/vendor/)?github.com/.*?/gin.handlerNameTest$", c.HandlerName()) } func handlerNameTest(c *Context) { diff --git a/debug_test.go b/debug_test.go index deceaa6e..284cae9f 100644 --- a/debug_test.go +++ b/debug_test.go @@ -63,7 +63,7 @@ func TestDebugPrintRoutes(t *testing.T) { defer teardown() debugPrintRoute("GET", "/path/to/route/:param", HandlersChain{func(c *Context) {}, handlerNameTest}) - assert.Regexp(t, `^\[GIN-debug\] GET /path/to/route/:param --> (.*/vendor/)?github.com/gin-gonic/gin.handlerNameTest \(2 handlers\)\n$`, w.String()) + assert.Regexp(t, `^\[GIN-debug\] GET /path/to/route/:param --> (.*/vendor/)?github.com/.*?/gin.handlerNameTest \(2 handlers\)\n$`, w.String()) } func setup(w io.Writer) { diff --git a/gin_integration_test.go b/gin_integration_test.go index b4bde1af..d5579131 100644 --- a/gin_integration_test.go +++ b/gin_integration_test.go @@ -7,11 +7,13 @@ import ( "net" "net/http" "os" + "runtime" "testing" "time" - "github.com/stretchr/testify/assert" "net/http/httptest" + + "github.com/stretchr/testify/assert" ) func testRequest(t *testing.T, url string) { @@ -77,6 +79,10 @@ func TestRunWithPort(t *testing.T) { } func TestUnixSocket(t *testing.T) { + if runtime.GOOS == "windows" { + return + } + router := New() go func() { @@ -101,6 +107,10 @@ func TestUnixSocket(t *testing.T) { } func TestBadUnixSocket(t *testing.T) { + if runtime.GOOS == "windows" { + return + } + router := New() assert.Error(t, router.RunUnix("#/tmp/unix_unit_test")) } diff --git a/gin_test.go b/gin_test.go index 3ab46976..2a95d333 100644 --- a/gin_test.go +++ b/gin_test.go @@ -275,27 +275,27 @@ func TestListOfRoutes(t *testing.T) { assertRoutePresent(t, list, RouteInfo{ Method: "GET", Path: "/favicon.ico", - Handler: "^(.*/vendor/)?github.com/gin-gonic/gin.handlerTest1$", + Handler: "^(.*/vendor/)?github.com/.*?/gin.handlerTest1$", }) assertRoutePresent(t, list, RouteInfo{ Method: "GET", Path: "/", - Handler: "^(.*/vendor/)?github.com/gin-gonic/gin.handlerTest1$", + Handler: "^(.*/vendor/)?github.com/.*?/gin.handlerTest1$", }) assertRoutePresent(t, list, RouteInfo{ Method: "GET", Path: "/users/", - Handler: "^(.*/vendor/)?github.com/gin-gonic/gin.handlerTest2$", + Handler: "^(.*/vendor/)?github.com/.*?/gin.handlerTest2$", }) assertRoutePresent(t, list, RouteInfo{ Method: "GET", Path: "/users/:id", - Handler: "^(.*/vendor/)?github.com/gin-gonic/gin.handlerTest1$", + Handler: "^(.*/vendor/)?github.com/.*?/gin.handlerTest1$", }) assertRoutePresent(t, list, RouteInfo{ Method: "POST", Path: "/users/:id", - Handler: "^(.*/vendor/)?github.com/gin-gonic/gin.handlerTest2$", + Handler: "^(.*/vendor/)?github.com/.*?/gin.handlerTest2$", }) } diff --git a/utils_test.go b/utils_test.go index 599172fe..b2581568 100644 --- a/utils_test.go +++ b/utils_test.go @@ -78,7 +78,7 @@ func TestFilterFlags(t *testing.T) { } func TestFunctionName(t *testing.T) { - assert.Regexp(t, `^(.*/vendor/)?github.com/gin-gonic/gin.somefunction$`, nameOfFunction(somefunction)) + assert.Regexp(t, `^(.*/vendor/)?github.com/.*?/gin.somefunction$`, nameOfFunction(somefunction)) } func somefunction() {