fixed test on windows (#1667)

* fixed test on windows
This commit is contained in:
Bill Thorp 2019-04-04 12:56:42 -04:00 committed by GitHub
parent bfdee78f05
commit 255b92b4b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -6,6 +6,7 @@ package piecestore_test
import ( import (
"io" "io"
"math/rand" "math/rand"
"strings"
"testing" "testing"
"time" "time"
@ -222,22 +223,21 @@ func TestDownload(t *testing.T) {
for _, tt := range []struct { for _, tt := range []struct {
pieceID storj.PieceID pieceID storj.PieceID
action pb.PieceAction action pb.PieceAction
err string errs []string
}{ }{
{ // should successfully download data { // should successfully download data
pieceID: orderLimit.PieceId, pieceID: orderLimit.PieceId,
action: pb.PieceAction_GET, action: pb.PieceAction_GET,
err: "",
}, },
{ // should err with piece ID not specified { // should err with piece ID not specified
pieceID: storj.PieceID{2}, pieceID: storj.PieceID{2},
action: pb.PieceAction_GET, action: pb.PieceAction_GET,
err: "no such file or directory", // TODO fix returned error errs: []string{"no such file or directory", "The system cannot find the path specified"},
}, },
{ // should successfully download data { // should successfully download data
pieceID: orderLimit.PieceId, pieceID: orderLimit.PieceId,
action: pb.PieceAction_PUT, action: pb.PieceAction_PUT,
err: "expected get or get repair or audit action got PUT", errs: []string{"expected get or get repair or audit action got PUT"},
}, },
} { } {
var serialNumber storj.SerialNumber var serialNumber storj.SerialNumber
@ -265,16 +265,16 @@ func TestDownload(t *testing.T) {
buffer := make([]byte, len(expectedData)) buffer := make([]byte, len(expectedData))
n, err := downloader.Read(buffer) n, err := downloader.Read(buffer)
if tt.err != "" { if len(tt.errs) > 0 {
} else { } else {
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, expectedData, buffer[:n]) require.Equal(t, expectedData, buffer[:n])
} }
err = downloader.Close() err = downloader.Close()
if tt.err != "" { if len(tt.errs) > 0 {
require.Error(t, err) require.Error(t, err)
require.Contains(t, err.Error(), tt.err) require.True(t, strings.Contains(err.Error(), tt.errs[0]) || strings.Contains(err.Error(), tt.errs[1]), err.Error())
} else { } else {
require.NoError(t, err) require.NoError(t, err)
} }