gcsstore: Cancel context in tests to please 'go vet'

This commit is contained in:
Marius 2019-06-11 16:52:36 +02:00
parent 18c24f83f4
commit 8ad39ff466
1 changed files with 8 additions and 2 deletions

View File

@ -167,7 +167,7 @@ func TestGetInfo(t *testing.T) {
service.EXPECT().FilterObjects(ctx, filterParams).Return(mockPartials, nil), service.EXPECT().FilterObjects(ctx, filterParams).Return(mockPartials, nil),
) )
ctxCancel, _ := context.WithCancel(ctx) ctxCancel, cancel := context.WithCancel(ctx)
service.EXPECT().GetObjectSize(ctxCancel, mockObjectParams0).Return(size, nil) service.EXPECT().GetObjectSize(ctxCancel, mockObjectParams0).Return(size, nil)
service.EXPECT().GetObjectSize(ctxCancel, mockObjectParams1).Return(size, nil) service.EXPECT().GetObjectSize(ctxCancel, mockObjectParams1).Return(size, nil)
lastGetObjectSize := service.EXPECT().GetObjectSize(ctxCancel, mockObjectParams2).Return(size, nil) lastGetObjectSize := service.EXPECT().GetObjectSize(ctxCancel, mockObjectParams2).Return(size, nil)
@ -177,6 +177,9 @@ func TestGetInfo(t *testing.T) {
info, err := store.GetInfo(mockID) info, err := store.GetInfo(mockID)
assert.Nil(err) assert.Nil(err)
assert.Equal(mockTusdInfo, info) assert.Equal(mockTusdInfo, info)
// Cancel the context to avoid getting an error from `go vet`
cancel()
} }
func TestGetInfoNotFound(t *testing.T) { func TestGetInfoNotFound(t *testing.T) {
@ -349,7 +352,7 @@ func TestFinishUpload(t *testing.T) {
service.EXPECT().FilterObjects(ctx, filterParams2).Return(mockPartials, nil), service.EXPECT().FilterObjects(ctx, filterParams2).Return(mockPartials, nil),
) )
ctxCancel, _ := context.WithCancel(ctx) ctxCancel, cancel := context.WithCancel(ctx)
service.EXPECT().GetObjectSize(ctxCancel, mockObjectParams0).Return(size, nil) service.EXPECT().GetObjectSize(ctxCancel, mockObjectParams0).Return(size, nil)
service.EXPECT().GetObjectSize(ctxCancel, mockObjectParams1).Return(size, nil) service.EXPECT().GetObjectSize(ctxCancel, mockObjectParams1).Return(size, nil)
lastGetObjectSize := service.EXPECT().GetObjectSize(ctxCancel, mockObjectParams2).Return(size, nil) lastGetObjectSize := service.EXPECT().GetObjectSize(ctxCancel, mockObjectParams2).Return(size, nil)
@ -359,6 +362,9 @@ func TestFinishUpload(t *testing.T) {
err = store.FinishUpload(mockID) err = store.FinishUpload(mockID)
assert.Nil(err) assert.Nil(err)
// Cancel the context to avoid getting an error from `go vet`
cancel()
} }
var mockTusdChunk0InfoJson = fmt.Sprintf(`{"ID":"%s","Size":%d,"Offset":%d,"MetaData":{"foo":"bar"}}`, mockID, mockSize, mockSize/3) var mockTusdChunk0InfoJson = fmt.Sprintf(`{"ID":"%s","Size":%d,"Offset":%d,"MetaData":{"foo":"bar"}}`, mockID, mockSize, mockSize/3)