From 444e156fb1ec2943af5308a790315833c74fdc5a Mon Sep 17 00:00:00 2001
From: mstmdev <mstmdev@gmail.com>
Date: Thu, 21 Apr 2022 18:21:46 +0800
Subject: [PATCH] Fix some tests (#3100)

* Sleep for one millisecond in the handler because the `Latency` will return `0s` sometimes and the test will fail

* The `TCPListener.File` is not supported by windows, it is unimplemented now

* Remove the `LF` in the `testdata/template/raw.tmpl`, because if set the git config `core.autocrlf=true`, will append `CR` to the raw.tmpl automatically, then test is failed on Windows
---
 gin_integration_test.go    | 16 +++++++++++++++-
 gin_test.go                |  4 ++--
 logger_test.go             |  1 +
 testdata/template/raw.tmpl |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/gin_integration_test.go b/gin_integration_test.go
index 8c22e7bd..0dfa9032 100644
--- a/gin_integration_test.go
+++ b/gin_integration_test.go
@@ -15,6 +15,7 @@ import (
 	"net/http/httptest"
 	"os"
 	"path/filepath"
+	"runtime"
 	"sync"
 	"testing"
 	"time"
@@ -281,7 +282,16 @@ func TestFileDescriptor(t *testing.T) {
 	listener, err := net.ListenTCP("tcp", addr)
 	assert.NoError(t, err)
 	socketFile, err := listener.File()
-	assert.NoError(t, err)
+	if isWindows() {
+		// not supported by windows, it is unimplemented now
+		assert.Error(t, err)
+	} else {
+		assert.NoError(t, err)
+	}
+
+	if socketFile == nil {
+		return
+	}
 
 	go func() {
 		router.GET("/example", func(c *Context) { c.String(http.StatusOK, "it worked") })
@@ -547,3 +557,7 @@ func TestTreeRunDynamicRouting(t *testing.T) {
 	testRequest(t, ts.URL+"/addr/dd/aa", "404 Not Found")
 	testRequest(t, ts.URL+"/something/secondthing/121", "404 Not Found")
 }
+
+func isWindows() bool {
+	return runtime.GOOS == "windows"
+}
diff --git a/gin_test.go b/gin_test.go
index 0c11134f..a4380622 100644
--- a/gin_test.go
+++ b/gin_test.go
@@ -202,7 +202,7 @@ func TestLoadHTMLGlobFromFuncMap(t *testing.T) {
 	}
 
 	resp, _ := ioutil.ReadAll(res.Body)
-	assert.Equal(t, "Date: 2017/07/01\n", string(resp))
+	assert.Equal(t, "Date: 2017/07/01", string(resp))
 }
 
 func init() {
@@ -320,7 +320,7 @@ func TestLoadHTMLFilesFuncMap(t *testing.T) {
 	}
 
 	resp, _ := ioutil.ReadAll(res.Body)
-	assert.Equal(t, "Date: 2017/07/01\n", string(resp))
+	assert.Equal(t, "Date: 2017/07/01", string(resp))
 }
 
 func TestAddRoute(t *testing.T) {
diff --git a/logger_test.go b/logger_test.go
index da1b654e..b7049988 100644
--- a/logger_test.go
+++ b/logger_test.go
@@ -208,6 +208,7 @@ func TestLoggerWithConfigFormatting(t *testing.T) {
 		// set dummy ClientIP
 		c.Request.Header.Set("X-Forwarded-For", "20.20.20.20")
 		gotKeys = c.Keys
+		time.Sleep(time.Millisecond)
 	})
 	PerformRequest(router, "GET", "/example?a=100")
 
diff --git a/testdata/template/raw.tmpl b/testdata/template/raw.tmpl
index 8bc75703..f3f530a4 100644
--- a/testdata/template/raw.tmpl
+++ b/testdata/template/raw.tmpl
@@ -1 +1 @@
-Date: {[{.now | formatAsDate}]}
+Date: {[{.now | formatAsDate}]}
\ No newline at end of file