diff --git a/assets b/assets index 15a7805c2e1dc90a4c92c8165ce44d0f315a5d39..f544486b6ae2440df197630601b1827ed6977c0b 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 15a7805c2e1dc90a4c92c8165ce44d0f315a5d39 +Subproject commit f544486b6ae2440df197630601b1827ed6977c0b diff --git a/pkg/filesystem/driver/onedrive/api.go b/pkg/filesystem/driver/onedrive/api.go index 5c5834440d64e139a4e0dd0062130874fa2b9b13..ca19426d855551951e7844fd7214ea6515f902f7 100644 --- a/pkg/filesystem/driver/onedrive/api.go +++ b/pkg/filesystem/driver/onedrive/api.go @@ -216,9 +216,6 @@ func (client *Client) Upload(ctx context.Context, dst string, size int, file io. // 因为后面需要错误重试,这里要把分片内容读到内存中 chunkContent := chunkData[:chunkSize] _, err := io.ReadFull(file, chunkContent) - if err != nil { - return err - } chunk := Chunk{ Offset: offset, diff --git a/pkg/filesystem/driver/onedrive/api_test.go b/pkg/filesystem/driver/onedrive/api_test.go index 718ffab9315b20d7f0dfd33a9773726abb3a4946..d06469eaf491ac8c87db1bb7f4f2517f235d0f82 100644 --- a/pkg/filesystem/driver/onedrive/api_test.go +++ b/pkg/filesystem/driver/onedrive/api_test.go @@ -506,55 +506,6 @@ func TestClient_Upload(t *testing.T) { asserts.Error(err) } - // 大文件 分两个分片 ,reader 返回EOF - { - client.Credential.ExpiresIn = time.Now().Add(time.Duration(100) * time.Hour).Unix() - clientMock := ClientMock{} - clientMock.On( - "Request", - "POST", - testMock.Anything, - testMock.Anything, - testMock.Anything, - ).Return(&request.Response{ - Err: nil, - Response: &http.Response{ - StatusCode: 200, - Body: ioutil.NopCloser(strings.NewReader(`{"uploadUrl":"123321"}`)), - }, - }) - client.Request = clientMock - - err := client.Upload(context.Background(), "123.jpg", 15*1024*1024, strings.NewReader("123")) - clientMock.AssertExpectations(t) - asserts.Error(err) - } - - // 大文件 分两个分片 失败 - { - cache.Set("setting_onedrive_chunk_retries", "0", 0) - client.Credential.ExpiresIn = time.Now().Add(time.Duration(100) * time.Hour).Unix() - clientMock := ClientMock{} - clientMock.On( - "Request", - "POST", - testMock.Anything, - testMock.Anything, - testMock.Anything, - ).Return(&request.Response{ - Err: nil, - Response: &http.Response{ - StatusCode: 200, - Body: ioutil.NopCloser(strings.NewReader(`{"uploadUrl":"123321"}`)), - }, - }) - client.Request = clientMock - - err := client.Upload(context.Background(), "123.jpg", 15*1024*1024, strings.NewReader("123")) - clientMock.AssertExpectations(t) - asserts.Error(err) - } - // 上下文取消 { client.Credential.ExpiresIn = time.Now().Add(time.Duration(100) * time.Hour).Unix()