Fixes error check

pull/34127/head
Graham Davison 2 years ago
parent 142a73b513
commit 807fc3e6d0

@ -231,13 +231,13 @@ func (c *RemoteClient) put(data []byte, optFns ...func(*s3.Options)) error {
})
_, err := uploader.Upload(ctx, input)
if err != nil {
return fmt.Errorf("failed to upload state: %s", err)
return fmt.Errorf("failed to upload state: %w", err)
}
if err := c.putMD5(ctx, sum[:]); err != nil {
// if this errors out, we unfortunately have to error out altogether,
// since the next Get will inevitably fail.
return fmt.Errorf("failed to store state MD5: %s", err)
return fmt.Errorf("failed to store state MD5: %w", err)
}
return nil

@ -7,6 +7,7 @@ import (
"bytes"
"context"
"crypto/md5"
"errors"
"fmt"
"io"
"testing"
@ -452,8 +453,10 @@ func TestRemoteClientSkipS3Checksum(t *testing.T) {
addCancelRequestMiddleware(),
)
})
if err != nil {
t.Fatal(err)
if err == nil {
t.Fatal("Expected an error, got none")
} else if !errors.Is(err, errCancelOperation) {
t.Fatalf("Unexpected error: %s", err)
}
if a, e := header, testcase.expected; a != e {

Loading…
Cancel
Save