mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-10-10 19:32:02 +00:00
[v11.0/forgejo] storage test: reader should not be closed on save (#9031)
Backport of the fixes for #8529 (v11 is currently not affected because minio-client is an older version. Porting the tests should help in preventing future breakages). - #8541: storage test (reader should not get closed) - #8527 #8816: defer uploader.Close (most robust way) - #8166: enable storage tests The test can be run locally: ``` docker run --rm -e MINIO_DOMAIN=minio -e MINIO_ROOT_USER=123456 -e MINIO_ROOT_PASSWORD=12345678 -p 9000:9000 data.forgejo.org/oci/bitnami/minio:2024.8.17 ``` ``` TEST_MINIO_ENDPOINT=localhost:9000 go test -v -run ^TestMinioStorageIterator$ ./modules/storage ``` ### Release notes - [x] I do not want this change to show in the release notes. - [ ] I want the title to show in the release notes with a link to this pull request. - [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title. Co-authored-by: Earl Warren <contact@earl-warren.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/9031 Reviewed-by: Michael Kriese <michael.kriese@gmx.de> Co-authored-by: oliverpool <git@olivier.pfad.fr> Co-committed-by: oliverpool <git@olivier.pfad.fr>
This commit is contained in:
parent
d21ef060c2
commit
3de4b351a2
5 changed files with 45 additions and 40 deletions
|
@ -5,6 +5,7 @@ package storage
|
|||
|
||||
import (
|
||||
"bytes"
|
||||
"io"
|
||||
"testing"
|
||||
|
||||
"forgejo.org/modules/setting"
|
||||
|
@ -13,22 +14,39 @@ import (
|
|||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
type spyCloser struct {
|
||||
io.Reader
|
||||
closed int
|
||||
}
|
||||
|
||||
func (s *spyCloser) Close() error {
|
||||
s.closed++
|
||||
return nil
|
||||
}
|
||||
|
||||
var _ io.ReadCloser = &spyCloser{}
|
||||
|
||||
func testStorageIterator(t *testing.T, typStr Type, cfg *setting.Storage) {
|
||||
l, err := NewStorage(typStr, cfg)
|
||||
require.NoError(t, err)
|
||||
|
||||
testFiles := [][]string{
|
||||
{"a/1.txt", "a1"},
|
||||
{"/a/1.txt", "aa1"}, // same as above, but with leading slash that will be trim
|
||||
{"ab/1.txt", "ab1"},
|
||||
{"b/1.txt", "b1"},
|
||||
{"b/2.txt", "b2"},
|
||||
{"b/3.txt", "b3"},
|
||||
{"b/x 4.txt", "bx4"},
|
||||
testFiles := []struct {
|
||||
path, content string
|
||||
size int64
|
||||
}{
|
||||
{"a/1.txt", "a1", -1},
|
||||
{"/a/1.txt", "aa1", -1}, // same as above, but with leading slash that will be trim
|
||||
{"ab/1.txt", "ab1", 3},
|
||||
{"b/1.txt", "b1", 2}, // minio closes when the size is set
|
||||
{"b/2.txt", "b2", -1},
|
||||
{"b/3.txt", "b3", -1},
|
||||
{"b/x 4.txt", "bx4", -1},
|
||||
}
|
||||
for _, f := range testFiles {
|
||||
_, err = l.Save(f[0], bytes.NewBufferString(f[1]), -1)
|
||||
sc := &spyCloser{bytes.NewBufferString(f.content), 0}
|
||||
_, err = l.Save(f.path, sc, f.size)
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, 0, sc.closed)
|
||||
}
|
||||
|
||||
expectedList := map[string][]string{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue