fix tests and lints for ObjectStorage

Author: fuxiaohei

modules/storage/local_test.go

@@ -57,27 +57,27 @@ func TestLocalStorageIterator(t *testing.T) {
 	l, err := NewLocalStorage(context.Background(), LocalStorageConfig{Path: "testdata/"})
 	assert.NoError(t, err)
 
-	test_files := [][]string{
+	testFiles := [][]string{
 		{"a/1.txt", "a1"},
 		{"/a/1.txt", "aa1"}, // same as above, but with leading slash that will be trim
 		{"b/1.txt", "b1"},
 		{"b/2.txt", "b2"},
 		{"b/3.txt", "b3"},
 		{"b/x 4.txt", "bx4"},
 	}
-	for _, f := range test_files {
+	for _, f := range testFiles {
 		_, err = l.Save(f[0], bytes.NewBufferString(f[1]), -1)
 		assert.NoError(t, err)
 	}
 
-	expected_list := map[string][]string{
+	expectedList := map[string][]string{
 		"a":           {"a/1.txt"},
 		"b":           {"b/1.txt", "b/2.txt", "b/3.txt", "b/x 4.txt"},
 		"":            {"a/1.txt", "b/1.txt", "b/2.txt", "b/3.txt", "b/x 4.txt"},
 		"/":           {"a/1.txt", "b/1.txt", "b/2.txt", "b/3.txt", "b/x 4.txt"},
 		"a/b/../../a": {"a/1.txt"},
 	}
-	for dir, expected := range expected_list {
+	for dir, expected := range expectedList {
 		count := 0
 		err = l.IterateObjects(dir, func(path string, f Object) error {
 			defer f.Close()
@@ -90,12 +90,12 @@ func TestLocalStorageIterator(t *testing.T) {
 	}
 
 	// illegal dir
-	illegal_dirs := []string{
+	illegalDirs := []string{
 		"../a",
 		"../../etc/hosts",
 		"../a/../b",
 	}
-	for _, dir := range illegal_dirs {
+	for _, dir := range illegalDirs {
 		err = l.IterateObjects(dir, func(path string, f Object) error {
 			defer f.Close()
 			return nil

tests/test_utils.go

@@ -201,7 +201,7 @@ func PrepareTestEnv(t testing.TB, skip ...int) func() {
 	lfsFixtures, err := storage.NewStorage("", storage.LocalStorageConfig{Path: path.Join(filepath.Dir(setting.AppPath), "tests/gitea-lfs-meta")})
 	assert.NoError(t, err)
 	assert.NoError(t, storage.Clean(storage.LFS))
-	assert.NoError(t, lfsFixtures.IterateObjects(func(path string, _ storage.Object) error {
+	assert.NoError(t, lfsFixtures.IterateObjects("", func(path string, _ storage.Object) error {
 		_, err := storage.Copy(storage.LFS, path, lfsFixtures, path)
 		return err
 	}))
@@ -258,7 +258,7 @@ func ResetFixtures(t *testing.T) {
 	lfsFixtures, err := storage.NewStorage("", storage.LocalStorageConfig{Path: path.Join(filepath.Dir(setting.AppPath), "tests/gitea-lfs-meta")})
 	assert.NoError(t, err)
 	assert.NoError(t, storage.Clean(storage.LFS))
-	assert.NoError(t, lfsFixtures.IterateObjects(func(path string, _ storage.Object) error {
+	assert.NoError(t, lfsFixtures.IterateObjects("", func(path string, _ storage.Object) error {
 		_, err := storage.Copy(storage.LFS, path, lfsFixtures, path)
 		return err
 	}))