From f0424524bb6aa0b36fd87dfe3f3cc1fbd5dfb36d Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 30 May 2023 08:49:11 -0700 Subject: [PATCH 1/2] [chore] add error check to test Signed-off-by: Alex Boten --- receiver/filereceiver/file_reader_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/receiver/filereceiver/file_reader_test.go b/receiver/filereceiver/file_reader_test.go index 8d098ac8b619..f4b9e85d9d32 100644 --- a/receiver/filereceiver/file_reader_test.go +++ b/receiver/filereceiver/file_reader_test.go @@ -39,10 +39,12 @@ func TestFileReader_Cancellation(t *testing.T) { stringReader: blockingStringReader{}, } ctx, cancel := context.WithCancel(context.Background()) + var err error go func() { - _ = fr.readAll(ctx) + err = fr.readAll(ctx) }() cancel() + require.NoError(t, err) } func TestFileReader_ReadAll(t *testing.T) { From bda4a3670cd0d40c694f83ab3fb9ed4893fdddca Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 30 May 2023 14:20:51 -0700 Subject: [PATCH 2/2] use a channel for errors Signed-off-by: Alex Boten --- receiver/filereceiver/file_reader_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/receiver/filereceiver/file_reader_test.go b/receiver/filereceiver/file_reader_test.go index f4b9e85d9d32..a888282815b3 100644 --- a/receiver/filereceiver/file_reader_test.go +++ b/receiver/filereceiver/file_reader_test.go @@ -39,12 +39,12 @@ func TestFileReader_Cancellation(t *testing.T) { stringReader: blockingStringReader{}, } ctx, cancel := context.WithCancel(context.Background()) - var err error + errs := make(chan error) go func() { - err = fr.readAll(ctx) + errs <- fr.readAll(ctx) }() cancel() - require.NoError(t, err) + require.Equal(t, 0, len(errs)) } func TestFileReader_ReadAll(t *testing.T) {