diff options
author | Valery Piashchynski <[email protected]> | 2021-03-28 21:24:12 +0300 |
---|---|---|
committer | Valery Piashchynski <[email protected]> | 2021-03-28 21:24:12 +0300 |
commit | b7d84bdf93ce90925f22091dd8df02985dd07a77 (patch) | |
tree | 70dd11bf64f8ac633749c96bd439ea91640ca7bd /tests | |
parent | 90df04b77bf8cf2c590680fbdde09e519e1b4f83 (diff) |
- Fix new linters warnings
Signed-off-by: Valery Piashchynski <[email protected]>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/mocks/mock_log.go | 20 | ||||
-rw-r--r-- | tests/plugins/http/uploads_test.go | 8 | ||||
-rw-r--r-- | tests/plugins/reload/reload_plugin_test.go | 46 |
3 files changed, 32 insertions, 42 deletions
diff --git a/tests/mocks/mock_log.go b/tests/mocks/mock_log.go index 66c70b91..ad70f9c0 100644 --- a/tests/mocks/mock_log.go +++ b/tests/mocks/mock_log.go @@ -44,9 +44,7 @@ func (m *MockLogger) Debug(msg string, keyvals ...interface{}) { defer m.Unlock() m.ctrl.T.Helper() varargs := []interface{}{msg} - for _, a := range keyvals { - varargs = append(varargs, a) - } + varargs = append(varargs, keyvals...) m.ctrl.Call(m, "Debug", varargs...) } @@ -56,9 +54,7 @@ func (m *MockLogger) Warn(msg string, keyvals ...interface{}) { defer m.Unlock() m.ctrl.T.Helper() varargs := []interface{}{msg} - for _, a := range keyvals { - varargs = append(varargs, a) - } + varargs = append(varargs, keyvals...) m.ctrl.Call(m, "Warn", varargs...) } @@ -68,9 +64,7 @@ func (m *MockLogger) Info(msg string, keyvals ...interface{}) { defer m.Unlock() m.ctrl.T.Helper() varargs := []interface{}{msg} - for _, a := range keyvals { - varargs = append(varargs, a) - } + varargs = append(varargs, keyvals...) m.ctrl.Call(m, "Info", varargs...) } @@ -80,9 +74,7 @@ func (m *MockLogger) Error(msg string, keyvals ...interface{}) { defer m.Unlock() m.ctrl.T.Helper() varargs := []interface{}{msg} - for _, a := range keyvals { - varargs = append(varargs, a) - } + varargs = append(varargs, keyvals...) m.ctrl.Call(m, "Error", varargs...) } @@ -145,9 +137,7 @@ func (m *MockWithLogger) EXPECT() *MockWithLoggerMockRecorder { func (m *MockWithLogger) With(keyvals ...interface{}) logger.Logger { m.ctrl.T.Helper() varargs := []interface{}{} - for _, a := range keyvals { - varargs = append(varargs, a) - } + varargs = append(varargs, keyvals...) ret := m.ctrl.Call(m, "With", varargs...) ret0, _ := ret[0].(logger.Logger) return ret0 diff --git a/tests/plugins/http/uploads_test.go b/tests/plugins/http/uploads_test.go index 68d4cbae..bc7e17df 100644 --- a/tests/plugins/http/uploads_test.go +++ b/tests/plugins/http/uploads_test.go @@ -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()) @@ -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) } } |