From 2c9e5fe47ae55defc55dae30a0e63192e4538bc2 Mon Sep 17 00:00:00 2001
From: Amir Hossein <77993374+Kamandlou@users.noreply.github.com>
Date: Thu, 1 Sep 2022 06:51:27 +0430
Subject: [PATCH] rename variable because collide with the imported package
name (#3298)
* rename variable because collide with the imported package name
* handle unhandled error in context_1.17_test.go
---
context_1.17_test.go | 7 ++++++-
gin_test.go | 4 ++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/context_1.17_test.go b/context_1.17_test.go
index 69c97864..23377ffd 100644
--- a/context_1.17_test.go
+++ b/context_1.17_test.go
@@ -30,7 +30,12 @@ func (i interceptedWriter) WriteHeader(code int) {
func TestContextFormFileFailed17(t *testing.T) {
buf := new(bytes.Buffer)
mw := multipart.NewWriter(buf)
- mw.Close()
+ defer func(mw *multipart.Writer) {
+ err := mw.Close()
+ if err != nil {
+ assert.Error(t, err)
+ }
+ }(mw)
c, _ := CreateTestContext(httptest.NewRecorder())
c.Request, _ = http.NewRequest("POST", "/", nil)
c.Request.Header.Set("Content-Type", mw.FormDataContentType())
diff --git a/gin_test.go b/gin_test.go
index 02f23247..4fac677a 100644
--- a/gin_test.go
+++ b/gin_test.go
@@ -100,7 +100,7 @@ func TestH2c(t *testing.T) {
url := "http://" + ln.Addr().String() + "/"
- http := http.Client{
+ httpClient := http.Client{
Transport: &http2.Transport{
AllowHTTP: true,
DialTLS: func(netw, addr string, cfg *tls.Config) (net.Conn, error) {
@@ -109,7 +109,7 @@ func TestH2c(t *testing.T) {
},
}
- res, err := http.Get(url)
+ res, err := httpClient.Get(url)
if err != nil {
fmt.Println(err)
}