alexvanin/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Merge pull request #4993 from MichaelEischer/fix-timeout-error

Browse source 
backend: return correct error on upload/request timeout
This commit is contained in:
Michael Eischer 2024-08-15 22:07:37 +02:00 committed by GitHub
commit 74d3f92cc7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
internal/backend/watchdog_roundtriper.go
View file

@ -65,6 +65,9 @@ func (w *watchdogRoundtripper) RoundTrip(req *http.Request) (*http.Response, err
resp, err := w.rt.RoundTrip(req) resp, err := w.rt.RoundTrip(req)
if err != nil { if err != nil {
if isTimeout(err) {
err = errRequestTimeout
}
return nil, err return nil, err
} }

4
internal/backend/watchdog_roundtriper_test.go
View file

@ -135,7 +135,7 @@ func TestUploadTimeout(t *testing.T) {
rtest.OK(t, err) rtest.OK(t, err)
resp, err := rt.RoundTrip(req) resp, err := rt.RoundTrip(req)
rtest.Equals(t, context.Canceled, err) rtest.Equals(t, errRequestTimeout, err)
// make linter happy // make linter happy
if resp != nil { if resp != nil {
rtest.OK(t, resp.Body.Close()) rtest.OK(t, resp.Body.Close())
@ -162,7 +162,7 @@ func TestProcessingTimeout(t *testing.T) {
rtest.OK(t, err) rtest.OK(t, err)
resp, err := rt.RoundTrip(req) resp, err := rt.RoundTrip(req)
rtest.Equals(t, context.Canceled, err) rtest.Equals(t, errRequestTimeout, err)
// make linter happy // make linter happy
if resp != nil { if resp != nil {
rtest.OK(t, resp.Body.Close()) rtest.OK(t, resp.Body.Close())