Merge pull request #2934 from MichaelEischer/upgrade-backoff

Upgrade github.com/cenkalti/backoff module
This commit is contained in:
MichaelEischer
2020-10-08 20:33:30 +02:00
committed by GitHub
4 changed files with 9 additions and 20 deletions

View File

@@ -6,7 +6,7 @@ import (
"io"
"time"
"github.com/cenkalti/backoff"
"github.com/cenkalti/backoff/v4"
"github.com/restic/restic/internal/debug"
"github.com/restic/restic/internal/restic"
)

View File

@@ -33,9 +33,7 @@ func TestBackendSaveRetry(t *testing.T) {
},
}
retryBackend := RetryBackend{
Backend: be,
}
retryBackend := NewRetryBackend(be, 10, nil)
data := test.Random(23, 5*1024*1024+11241)
err := retryBackend.Save(context.TODO(), restic.Handle{}, restic.NewByteReader(data))
@@ -73,9 +71,7 @@ func TestBackendListRetry(t *testing.T) {
},
}
retryBackend := RetryBackend{
Backend: be,
}
retryBackend := NewRetryBackend(be, 10, nil)
var listed []string
err := retryBackend.List(context.TODO(), restic.PackFile, func(fi restic.FileInfo) error {
@@ -104,9 +100,7 @@ func TestBackendListRetryErrorFn(t *testing.T) {
},
}
retryBackend := RetryBackend{
Backend: be,
}
retryBackend := NewRetryBackend(be, 10, nil)
var ErrTest = errors.New("test error")
@@ -162,10 +156,7 @@ func TestBackendListRetryErrorBackend(t *testing.T) {
}
const maxRetries = 2
retryBackend := RetryBackend{
MaxTries: maxRetries,
Backend: be,
}
retryBackend := NewRetryBackend(be, maxRetries, nil)
var listed []string
err := retryBackend.List(context.TODO(), restic.PackFile, func(fi restic.FileInfo) error {
@@ -234,9 +225,7 @@ func TestBackendLoadRetry(t *testing.T) {
return failingReader{data: data, limit: limit}, nil
}
retryBackend := RetryBackend{
Backend: be,
}
retryBackend := NewRetryBackend(be, 10, nil)
var buf []byte
err := retryBackend.Load(context.TODO(), restic.Handle{}, 0, 0, func(rd io.Reader) (err error) {