JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

storagenode/piecestore: fix error handling in TestDownload

Browse Source 
If a read error is returned, we want to preserve it instead of
overriding it with close error

Change-Id: Ie253a453c7b6b62598b89dffd7635b8266357074
This commit is contained in:
Yingrong Zhao 2021-04-22 12:02:48 -04:00 committed by Yingrong Zhao
parent 31c1137860
commit 307886ffe8
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
storagenode/piecestore/endpoint_test.go
View File

@ -256,6 +256,7 @@ func TestDownload(t *testing.T) {
errs: []string{"expected get or get repair or audit action got PUT"},
},
} {
tt := tt
serialNumber := testrand.SerialNumber()
orderLimit, piecePrivateKey := GenerateOrderLimit(
@ -277,25 +278,31 @@ func TestDownload(t *testing.T) {
require.NoError(t, err)
buffer := make([]byte, len(expectedData))
n, err := downloader.Read(buffer)
n, readErr := downloader.Read(buffer)
if len(tt.errs) > 0 {
} else {
require.NoError(t, err)
require.NoError(t, readErr)
require.Equal(t, expectedData, buffer[:n])
}
err = downloader.Close()
numErrs := len(tt.errs)
if numErrs > 0 {
require.Error(t, err)
}
if numErrs == 1 {
require.True(t, strings.Contains(err.Error(), tt.errs[0]))
} else if numErrs == 2 {
require.True(t, strings.Contains(err.Error(), tt.errs[0]) || strings.Contains(err.Error(), tt.errs[1]), err.Error())
} else {
closeErr := downloader.Close()
err = errs.Combine(readErr, closeErr)
switch len(tt.errs) {
case 0:
require.NoError(t, err)
case 1:
require.Error(t, err)
require.Contains(t, err.Error(), tt.errs[0])
case 2:
require.Error(t, err)
require.Conditionf(t, func() bool {
return strings.Contains(err.Error(), tt.errs[0]) ||
strings.Contains(err.Error(), tt.errs[1])
}, "expected error to contain %q or %q, but it does not: %v", tt.errs[0], tt.errs[1], err)
default:
require.FailNow(t, "unexpected number of error cases")
}
// these should only be not-nil if action = pb.PieceAction_GET_REPAIR