summaryrefslogtreecommitdiff
path: root/tests/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'tests/plugins')
-rw-r--r--tests/plugins/http/handler_test.go186
-rw-r--r--tests/plugins/http/uploads_test.go86
-rw-r--r--tests/plugins/reload/reload_plugin_test.go46
3 files changed, 159 insertions, 159 deletions
diff --git a/tests/plugins/http/handler_test.go b/tests/plugins/http/handler_test.go
index fc672e36..cf445aad 100644
--- a/tests/plugins/http/handler_test.go
+++ b/tests/plugins/http/handler_test.go
@@ -43,13 +43,13 @@ func TestHandler_Echo(t *testing.T) {
hs := &http.Server{Addr: ":8177", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func(server *http.Server) {
- err := server.ListenAndServe()
+ err = server.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -97,14 +97,14 @@ func TestHandler_Headers(t *testing.T) {
hs := &http.Server{Addr: ":8078", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -119,7 +119,7 @@ func TestHandler_Headers(t *testing.T) {
r, err := http.DefaultClient.Do(req)
assert.NoError(t, err)
defer func() {
- err := r.Body.Close()
+ err = r.Body.Close()
if err != nil {
t.Errorf("error during the closing Body: error %v", err)
}
@@ -158,14 +158,14 @@ func TestHandler_Empty_User_Agent(t *testing.T) {
hs := &http.Server{Addr: ":19658", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -180,7 +180,7 @@ func TestHandler_Empty_User_Agent(t *testing.T) {
r, err := http.DefaultClient.Do(req)
assert.NoError(t, err)
defer func() {
- err := r.Body.Close()
+ err = r.Body.Close()
if err != nil {
t.Errorf("error during the closing Body: error %v", err)
}
@@ -218,14 +218,14 @@ func TestHandler_User_Agent(t *testing.T) {
hs := &http.Server{Addr: ":25688", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -240,7 +240,7 @@ func TestHandler_User_Agent(t *testing.T) {
r, err := http.DefaultClient.Do(req)
assert.NoError(t, err)
defer func() {
- err := r.Body.Close()
+ err = r.Body.Close()
if err != nil {
t.Errorf("error during the closing Body: error %v", err)
}
@@ -278,14 +278,14 @@ func TestHandler_Cookies(t *testing.T) {
hs := &http.Server{Addr: ":8079", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -300,7 +300,7 @@ func TestHandler_Cookies(t *testing.T) {
r, err := http.DefaultClient.Do(req)
assert.NoError(t, err)
defer func() {
- err := r.Body.Close()
+ err = r.Body.Close()
if err != nil {
t.Errorf("error during the closing Body: error %v", err)
}
@@ -343,14 +343,14 @@ func TestHandler_JsonPayload_POST(t *testing.T) {
hs := &http.Server{Addr: ":8090", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -369,7 +369,7 @@ func TestHandler_JsonPayload_POST(t *testing.T) {
r, err := http.DefaultClient.Do(req)
assert.NoError(t, err)
defer func() {
- err := r.Body.Close()
+ err = r.Body.Close()
if err != nil {
t.Errorf("error during the closing Body: error %v", err)
}
@@ -407,14 +407,14 @@ func TestHandler_JsonPayload_PUT(t *testing.T) {
hs := &http.Server{Addr: ":8081", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -429,7 +429,7 @@ func TestHandler_JsonPayload_PUT(t *testing.T) {
r, err := http.DefaultClient.Do(req)
assert.NoError(t, err)
defer func() {
- err := r.Body.Close()
+ err = r.Body.Close()
if err != nil {
t.Errorf("error during the closing Body: error %v", err)
}
@@ -467,14 +467,14 @@ func TestHandler_JsonPayload_PATCH(t *testing.T) {
hs := &http.Server{Addr: ":8082", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -489,7 +489,7 @@ func TestHandler_JsonPayload_PATCH(t *testing.T) {
r, err := http.DefaultClient.Do(req)
assert.NoError(t, err)
defer func() {
- err := r.Body.Close()
+ err = r.Body.Close()
if err != nil {
t.Errorf("error during the closing Body: error %v", err)
}
@@ -527,14 +527,14 @@ func TestHandler_FormData_POST(t *testing.T) {
hs := &http.Server{Addr: ":8083", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -560,7 +560,7 @@ func TestHandler_FormData_POST(t *testing.T) {
r, err := http.DefaultClient.Do(req)
assert.NoError(t, err)
defer func() {
- err := r.Body.Close()
+ err = r.Body.Close()
if err != nil {
t.Errorf("error during the closing Body: error %v", err)
}
@@ -600,14 +600,14 @@ func TestHandler_FormData_POST_Overwrite(t *testing.T) {
hs := &http.Server{Addr: ":8083", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -634,7 +634,7 @@ func TestHandler_FormData_POST_Overwrite(t *testing.T) {
r, err := http.DefaultClient.Do(req)
assert.NoError(t, err)
defer func() {
- err := r.Body.Close()
+ err = r.Body.Close()
if err != nil {
t.Errorf("error during the closing Body: error %v", err)
}
@@ -673,14 +673,14 @@ func TestHandler_FormData_POST_Form_UrlEncoded_Charset(t *testing.T) {
hs := &http.Server{Addr: ":8083", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -706,7 +706,7 @@ func TestHandler_FormData_POST_Form_UrlEncoded_Charset(t *testing.T) {
r, err := http.DefaultClient.Do(req)
assert.NoError(t, err)
defer func() {
- err := r.Body.Close()
+ err = r.Body.Close()
if err != nil {
t.Errorf("error during the closing Body: error %v", err)
}
@@ -745,14 +745,14 @@ func TestHandler_FormData_PUT(t *testing.T) {
hs := &http.Server{Addr: ":17834", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -778,7 +778,7 @@ func TestHandler_FormData_PUT(t *testing.T) {
r, err := http.DefaultClient.Do(req)
assert.NoError(t, err)
defer func() {
- err := r.Body.Close()
+ err = r.Body.Close()
if err != nil {
t.Errorf("error during the closing Body: error %v", err)
}
@@ -817,14 +817,14 @@ func TestHandler_FormData_PATCH(t *testing.T) {
hs := &http.Server{Addr: ":8085", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -850,7 +850,7 @@ func TestHandler_FormData_PATCH(t *testing.T) {
r, err := http.DefaultClient.Do(req)
assert.NoError(t, err)
defer func() {
- err := r.Body.Close()
+ err = r.Body.Close()
if err != nil {
t.Errorf("error during the closing Body: error %v", err)
}
@@ -889,14 +889,14 @@ func TestHandler_Multipart_POST(t *testing.T) {
hs := &http.Server{Addr: ":8019", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -964,7 +964,7 @@ func TestHandler_Multipart_POST(t *testing.T) {
r, err := http.DefaultClient.Do(req)
assert.NoError(t, err)
defer func() {
- err := r.Body.Close()
+ err = r.Body.Close()
if err != nil {
t.Errorf("error during the closing Body: error %v", err)
}
@@ -1003,14 +1003,14 @@ func TestHandler_Multipart_PUT(t *testing.T) {
hs := &http.Server{Addr: ":8020", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -1078,7 +1078,7 @@ func TestHandler_Multipart_PUT(t *testing.T) {
r, err := http.DefaultClient.Do(req)
assert.NoError(t, err)
defer func() {
- err := r.Body.Close()
+ err = r.Body.Close()
if err != nil {
t.Errorf("error during the closing Body: error %v", err)
}
@@ -1117,14 +1117,14 @@ func TestHandler_Multipart_PATCH(t *testing.T) {
hs := &http.Server{Addr: ":8021", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
@@ -1194,7 +1194,7 @@ func TestHandler_Multipart_PATCH(t *testing.T) {
r, err := http.DefaultClient.Do(req)
assert.NoError(t, err)
defer func() {
- err := r.Body.Close()
+ err = r.Body.Close()
if err != nil {
t.Errorf("error during the closing Body: error %v", err)
}
@@ -1233,14 +1233,14 @@ func TestHandler_Error(t *testing.T) {
hs := &http.Server{Addr: ":8177", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -1279,14 +1279,14 @@ func TestHandler_Error2(t *testing.T) {
hs := &http.Server{Addr: ":8177", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -1325,8 +1325,8 @@ func TestHandler_Error3(t *testing.T) {
hs := &http.Server{Addr: ":8177", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
@@ -1384,14 +1384,14 @@ func TestHandler_ResponseDuration(t *testing.T) {
hs := &http.Server{Addr: ":8177", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -1445,14 +1445,14 @@ func TestHandler_ResponseDurationDelayed(t *testing.T) {
hs := &http.Server{Addr: ":8177", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -1505,8 +1505,8 @@ func TestHandler_ErrorDuration(t *testing.T) {
hs := &http.Server{Addr: ":8177", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
@@ -1579,14 +1579,14 @@ func TestHandler_IP(t *testing.T) {
hs := &http.Server{Addr: "127.0.0.1:8177", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -1640,14 +1640,14 @@ func TestHandler_XRealIP(t *testing.T) {
hs := &http.Server{Addr: "127.0.0.1:8179", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -1706,14 +1706,14 @@ func TestHandler_XForwardedFor(t *testing.T) {
hs := &http.Server{Addr: "127.0.0.1:8177", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -1771,14 +1771,14 @@ func TestHandler_XForwardedFor_NotTrustedRemoteIp(t *testing.T) {
hs := &http.Server{Addr: "127.0.0.1:8177", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -1819,8 +1819,8 @@ func BenchmarkHandler_Listen_Echo(b *testing.B) {
hs := &http.Server{Addr: ":8177", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
b.Errorf("error during the shutdown: error %v", err)
}
}()
diff --git a/tests/plugins/http/uploads_test.go b/tests/plugins/http/uploads_test.go
index dd986902..bc7e17df 100644
--- a/tests/plugins/http/uploads_test.go
+++ b/tests/plugins/http/uploads_test.go
@@ -48,16 +48,16 @@ func TestHandler_Upload_File(t *testing.T) {
hs := &http.Server{Addr: ":8021", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
- t.Errorf("error during the shutdown: error %v", err)
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
+ t.Errorf("error during the shutdown: error %v", errS)
}
}()
go func() {
- err := hs.ListenAndServe()
- if err != nil && err != http.ErrServerClosed {
- t.Errorf("error listening the interface: error %v", err)
+ errL := hs.ListenAndServe()
+ if errL != nil && errL != http.ErrServerClosed {
+ t.Errorf("error listening the interface: error %v", errL)
}
}()
time.Sleep(time.Millisecond * 10)
@@ -67,9 +67,9 @@ func TestHandler_Upload_File(t *testing.T) {
f := mustOpen(testFile)
defer func() {
- err := f.Close()
- if err != nil {
- t.Errorf("failed to close a file: error %v", err)
+ errC := f.Close()
+ if errC != nil {
+ t.Errorf("failed to close a file: error %v", errC)
}
}()
fw, err := w.CreateFormFile("upload", f.Name())
@@ -93,9 +93,9 @@ func TestHandler_Upload_File(t *testing.T) {
r, err := http.DefaultClient.Do(req)
assert.NoError(t, err)
defer func() {
- err := r.Body.Close()
- if err != nil {
- t.Errorf("error closing the Body: error %v", err)
+ errC := r.Body.Close()
+ if errC != nil {
+ t.Errorf("error closing the Body: error %v", errC)
}
}()
@@ -131,16 +131,16 @@ func TestHandler_Upload_NestedFile(t *testing.T) {
hs := &http.Server{Addr: ":8021", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
- t.Errorf("error during the shutdown: error %v", err)
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
+ t.Errorf("error during the shutdown: error %v", errS)
}
}()
go func() {
- err := hs.ListenAndServe()
- if err != nil && err != http.ErrServerClosed {
- t.Errorf("error listening the interface: error %v", err)
+ errL := hs.ListenAndServe()
+ if errL != nil && errL != http.ErrServerClosed {
+ t.Errorf("error listening the interface: error %v", errL)
}
}()
time.Sleep(time.Millisecond * 10)
@@ -150,9 +150,9 @@ func TestHandler_Upload_NestedFile(t *testing.T) {
f := mustOpen(testFile)
defer func() {
- err := f.Close()
- if err != nil {
- t.Errorf("failed to close a file: error %v", err)
+ errC := hs.Close()
+ if errC != nil {
+ t.Errorf("failed to close a file: error %v", errC)
}
}()
fw, err := w.CreateFormFile("upload[x][y][z][]", f.Name())
@@ -176,9 +176,9 @@ func TestHandler_Upload_NestedFile(t *testing.T) {
r, err := http.DefaultClient.Do(req)
assert.NoError(t, err)
defer func() {
- err := r.Body.Close()
- if err != nil {
- t.Errorf("error closing the Body: error %v", err)
+ errC := r.Body.Close()
+ if errC != nil {
+ t.Errorf("error closing the Body: error %v", errC)
}
}()
@@ -214,14 +214,14 @@ func TestHandler_Upload_File_NoTmpDir(t *testing.T) {
hs := &http.Server{Addr: ":8021", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -233,9 +233,9 @@ func TestHandler_Upload_File_NoTmpDir(t *testing.T) {
f := mustOpen(testFile)
defer func() {
- err := f.Close()
- if err != nil {
- t.Errorf("failed to close a file: error %v", err)
+ errC := hs.Close()
+ if errC != nil {
+ t.Errorf("failed to close a file: error %v", errC)
}
}()
fw, err := w.CreateFormFile("upload", f.Name())
@@ -259,9 +259,9 @@ func TestHandler_Upload_File_NoTmpDir(t *testing.T) {
r, err := http.DefaultClient.Do(req)
assert.NoError(t, err)
defer func() {
- err := r.Body.Close()
- if err != nil {
- t.Errorf("error closing the Body: error %v", err)
+ errC := r.Body.Close()
+ if errC != nil {
+ t.Errorf("error closing the Body: error %v", errC)
}
}()
@@ -297,14 +297,14 @@ func TestHandler_Upload_File_Forbids(t *testing.T) {
hs := &http.Server{Addr: ":8021", Handler: h}
defer func() {
- err := hs.Shutdown(context.Background())
- if err != nil {
+ errS := hs.Shutdown(context.Background())
+ if errS != nil {
t.Errorf("error during the shutdown: error %v", err)
}
}()
go func() {
- err := hs.ListenAndServe()
+ err = hs.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
t.Errorf("error listening the interface: error %v", err)
}
@@ -316,9 +316,9 @@ func TestHandler_Upload_File_Forbids(t *testing.T) {
f := mustOpen(testFile)
defer func() {
- err := f.Close()
- if err != nil {
- t.Errorf("failed to close a file: error %v", err)
+ errC := hs.Close()
+ if errC != nil {
+ t.Errorf("failed to close a file: error %v", errC)
}
}()
fw, err := w.CreateFormFile("upload", f.Name())
@@ -342,9 +342,9 @@ func TestHandler_Upload_File_Forbids(t *testing.T) {
r, err := http.DefaultClient.Do(req)
assert.NoError(t, err)
defer func() {
- err := r.Body.Close()
- if err != nil {
- t.Errorf("error closing the Body: error %v", err)
+ errC := r.Body.Close()
+ if errC != nil {
+ t.Errorf("error closing the Body: error %v", errC)
}
}()
@@ -419,7 +419,7 @@ func fileString(f string, errNo int, mime string) string {
r, err := json.Marshal(v)
if err != nil {
- fmt.Println(fmt.Errorf("error marshalling fInfo, error: %v", err))
+ fmt.Println(fmt.Errorf("error marshaling fInfo, error: %v", err))
}
return string(r)
}
diff --git a/tests/plugins/reload/reload_plugin_test.go b/tests/plugins/reload/reload_plugin_test.go
index 2e246480..dcbedb0f 100644
--- a/tests/plugins/reload/reload_plugin_test.go
+++ b/tests/plugins/reload/reload_plugin_test.go
@@ -220,10 +220,10 @@ func randomlyChangeFile(t *testing.T) {
// let's try to randomly change it
for i := 0; i < 10; i++ {
// rand sleep
- rSleep := rand.Int63n(500) // nolint:gosec
+ rSleep := rand.Int63n(500) //nolint:gosec
time.Sleep(time.Millisecond * time.Duration(rSleep))
- rNum := rand.Int63n(int64(hugeNumberOfFiles)) // nolint:gosec
- err := ioutil.WriteFile(filepath.Join(testDir, "file_"+strconv.Itoa(int(rNum))+".txt"), []byte("Hello, Gophers!"), 0755) // nolint:gosec
+ rNum := rand.Int63n(int64(hugeNumberOfFiles)) //nolint:gosec
+ err := ioutil.WriteFile(filepath.Join(testDir, "file_"+strconv.Itoa(int(rNum))+".txt"), []byte("Hello, Gophers!"), 0755) //nolint:gosec
assert.NoError(t, err)
}
}
@@ -339,20 +339,20 @@ func reloadFilteredExt(t *testing.T) {
// change files with abc extension
for i := 0; i < 10; i++ {
// rand sleep
- rSleep := rand.Int63n(1000) // nolint:gosec
+ rSleep := rand.Int63n(1000) //nolint:gosec
time.Sleep(time.Millisecond * time.Duration(rSleep))
- rNum := rand.Int63n(int64(hugeNumberOfFiles)) // nolint:gosec
- err := ioutil.WriteFile(filepath.Join(testDir, "file_"+strconv.Itoa(int(rNum))+".abc"), []byte("Hello, Gophers!"), 0755) // nolint:gosec
+ rNum := rand.Int63n(int64(hugeNumberOfFiles)) //nolint:gosec
+ err := ioutil.WriteFile(filepath.Join(testDir, "file_"+strconv.Itoa(int(rNum))+".abc"), []byte("Hello, Gophers!"), 0755) //nolint:gosec
assert.NoError(t, err)
}
// change files with def extension
for i := 0; i < 10; i++ {
// rand sleep
- rSleep := rand.Int63n(1000) // nolint:gosec
+ rSleep := rand.Int63n(1000) //nolint:gosec
time.Sleep(time.Millisecond * time.Duration(rSleep))
- rNum := rand.Int63n(int64(hugeNumberOfFiles)) // nolint:gosec
- err := ioutil.WriteFile(filepath.Join(testDir, "file_"+strconv.Itoa(int(rNum))+".def"), []byte("Hello, Gophers!"), 0755) // nolint:gosec
+ rNum := rand.Int63n(int64(hugeNumberOfFiles)) //nolint:gosec
+ err := ioutil.WriteFile(filepath.Join(testDir, "file_"+strconv.Itoa(int(rNum))+".def"), []byte("Hello, Gophers!"), 0755) //nolint:gosec
assert.NoError(t, err)
}
}
@@ -476,11 +476,11 @@ func reloadMoveSupport(t *testing.T) {
// move some files
for i := 0; i < 10; i++ {
// rand sleep
- rSleep := rand.Int63n(500) // nolint:gosec
+ rSleep := rand.Int63n(500) //nolint:gosec
time.Sleep(time.Millisecond * time.Duration(rSleep))
- rNum := rand.Int63n(int64(33)) // nolint:gosec
- rDir := rand.Int63n(9) // nolint:gosec
- rExt := rand.Int63n(3) // nolint:gosec
+ rNum := rand.Int63n(int64(33)) //nolint:gosec
+ rDir := rand.Int63n(9) //nolint:gosec
+ rExt := rand.Int63n(3) //nolint:gosec
ext := []string{
".txt",
@@ -512,11 +512,11 @@ func removeFilesSupport(t *testing.T) {
// remove some files
for i := 0; i < 10; i++ {
// rand sleep
- rSleep := rand.Int63n(500) // nolint:gosec
+ rSleep := rand.Int63n(500) //nolint:gosec
time.Sleep(time.Millisecond * time.Duration(rSleep))
- rNum := rand.Int63n(int64(100)) // nolint:gosec
- rDir := rand.Int63n(10) // nolint:gosec
- rExt := rand.Int63n(3) // nolint:gosec
+ rNum := rand.Int63n(int64(100)) //nolint:gosec
+ rDir := rand.Int63n(10) //nolint:gosec
+ rExt := rand.Int63n(3) //nolint:gosec
ext := []string{
".txt",
@@ -570,14 +570,14 @@ func randomChangesInRecursiveDirs(t *testing.T) {
}
for i := 0; i < 10; i++ {
// rand sleep
- rSleep := rand.Int63n(100) // nolint:gosec
+ rSleep := rand.Int63n(100) //nolint:gosec
time.Sleep(time.Millisecond * time.Duration(rSleep))
- rNum := rand.Int63n(int64(100)) // nolint:gosec
- rDir := rand.Int63n(10) // nolint:gosec
- rExt := rand.Int63n(3) // nolint:gosec
- rName := rand.Int63n(3) // nolint:gosec
+ rNum := rand.Int63n(int64(100)) //nolint:gosec
+ rDir := rand.Int63n(10) //nolint:gosec
+ rExt := rand.Int63n(3) //nolint:gosec
+ rName := rand.Int63n(3) //nolint:gosec
- err := ioutil.WriteFile(filepath.Join(dirs[rDir], filenames[rName]+strconv.Itoa(int(rNum))+ext[rExt]), []byte("Hello, Gophers!"), 0755) // nolint:gosec
+ err := ioutil.WriteFile(filepath.Join(dirs[rDir], filenames[rName]+strconv.Itoa(int(rNum))+ext[rExt]), []byte("Hello, Gophers!"), 0755) //nolint:gosec
assert.NoError(t, err)
}
}