johanels/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-12-11 22:14:05 +01:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

lib/readers: factor ErrorReader from multiple sources

Browse Source
This commit is contained in:
Nick Craig-Wood
2020-03-27 11:12:21 +00:00
parent 36d2c46bcf
commit cd3c699f28
6 changed files with 39 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fs/operations/operations_test.go
View File

@@ -45,6 +45,7 @@ import (
"github.com/rclone/rclone/fs/operations"
"github.com/rclone/rclone/fstest"
"github.com/rclone/rclone/lib/random"
"github.com/rclone/rclone/lib/readers"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@@ -1156,14 +1157,6 @@ func TestOverlapping(t *testing.T) {
}
}
type errorReader struct {
err error
}
func (er errorReader) Read(p []byte) (n int, err error) {
return 0, er.err
}
func TestCheckEqualReaders(t *testing.T) {
b65a := make([]byte, 65*1024)
b65b := make([]byte, 65*1024)
@@ -1189,7 +1182,7 @@ func TestCheckEqualReaders(t *testing.T) {
myErr := errors.New("sentinel")
wrap := func(b []byte) io.Reader {
r := bytes.NewBuffer(b)
e := errorReader{myErr}
e := readers.ErrorReader{Err: myErr}
return io.MultiReader(r, e)
}