mirror of
https://github.com/stashapp/stash.git
synced 2025-12-17 04:14:39 +03:00
Lint checks phase 2 (#1747)
* Log 3 unchecked errors Rather than ignore errors, log them at the WARNING log level. The server has been functioning without these, so assume they are not at the ERROR level. * Log errors in concurrency test If we can't initialize the configuration, treat the test as a failure. * Undo the errcheck on configurations for now. * Handle unchecked errors in pkg/manager * Resolve unchecked errors * Handle DLNA/DMS unchecked errors * Handle error checking in concurrency test Generalize config initialization, so we can initialize a configuration without writing it to disk. Use this in the test case, since otherwise the test fails to write. * Handle the remaining unchecked errors * Heed gosimple in update test * Use one-line if-initializer statements While here, fix a wrong variable capture error. * testing.T doesn't support %w use %v instead which is supported. * Remove unused query builder functions The Int/String criterion handler functions are now generalized. Thus, there's no need to keep these functions around anymore. * Mark filterBuilder.addRecursiveWith nolint The function is useful in the future and no other refactors are looking nice. Keep the function around, but tell the linter to ignore it. * Remove utils.Btoi There are no users of this utility function * Return error on scan failure If we fail to scan the row when looking for the unique checksum index, then report the error upwards. * Fix comments on exported functions * Fix typos * Fix startup error
This commit is contained in:
@@ -2,11 +2,12 @@ package tag
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/stashapp/stash/pkg/models"
|
||||
"github.com/stashapp/stash/pkg/models/mocks"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/mock"
|
||||
"testing"
|
||||
)
|
||||
|
||||
var testUniqueHierarchyTags = map[int]*models.Tag{
|
||||
@@ -211,8 +212,7 @@ func testEnsureUniqueHierarchy(t *testing.T, tc testUniqueHierarchyCase, queryPa
|
||||
mockTagReader := &mocks.TagReaderWriter{}
|
||||
|
||||
var parentIDs, childIDs []int
|
||||
var find map[int]*models.Tag
|
||||
find = make(map[int]*models.Tag)
|
||||
find := make(map[int]*models.Tag)
|
||||
if tc.parents != nil {
|
||||
parentIDs = make([]int, 0)
|
||||
for _, parent := range tc.parents {
|
||||
@@ -262,7 +262,7 @@ func testEnsureUniqueHierarchy(t *testing.T, tc testUniqueHierarchyCase, queryPa
|
||||
}
|
||||
return nil
|
||||
}, func(tagID int, excludeIDs []int) error {
|
||||
for id, _ := range tc.onFindAllAncestors {
|
||||
for id := range tc.onFindAllAncestors {
|
||||
if id == tagID {
|
||||
return nil
|
||||
}
|
||||
@@ -278,7 +278,7 @@ func testEnsureUniqueHierarchy(t *testing.T, tc testUniqueHierarchyCase, queryPa
|
||||
}
|
||||
return nil
|
||||
}, func(tagID int, excludeIDs []int) error {
|
||||
for id, _ := range tc.onFindAllDescendants {
|
||||
for id := range tc.onFindAllDescendants {
|
||||
if id == tagID {
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user