From ec6a6e2ed34941dab5f19b619c954b925fb0f64b Mon Sep 17 00:00:00 2001 From: Leonard Lyubich Date: Wed, 4 Dec 2024 19:49:27 +0300 Subject: [PATCH] pool: Fix NPE in AIO test Payload reader is nil when error. Also replace `defer` with native test cleaner. Signed-off-by: Leonard Lyubich --- pool/pool_aio_test.go | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pool/pool_aio_test.go b/pool/pool_aio_test.go index c06e5d69..341f42f3 100644 --- a/pool/pool_aio_test.go +++ b/pool/pool_aio_test.go @@ -341,11 +341,9 @@ func testPoolInterfaceWithAIO(t *testing.T, nodeAddr string) { var cmd client.PrmObjectGet hdr, read, err := pool.ObjectGetInit(ctxTimeout, containerID, objectID, signer, cmd) - defer func() { - _ = read.Close() - }() - require.NoError(t, err) + t.Cleanup(func() { _ = read.Close() }) + require.False(t, hdr.Owner().IsZero()) require.True(t, hdr.Owner() == account) @@ -498,11 +496,9 @@ func testPoolWaiterWithAIO(t *testing.T, nodeAddr string) { var cmd client.PrmObjectGet hdr, read, err := pool.ObjectGetInit(ctxTimeout, containerID, objectID, signer, cmd) - defer func() { - _ = read.Close() - }() - require.NoError(t, err) + t.Cleanup(func() { _ = read.Close() }) + require.False(t, hdr.Owner().IsZero()) require.True(t, hdr.Owner() == account) @@ -654,11 +650,9 @@ func testClientWaiterWithAIO(t *testing.T, nodeAddr string) { var cmd client.PrmObjectGet hdr, read, err := cl.ObjectGetInit(ctxTimeout, containerID, objectID, signer, cmd) - defer func() { - _ = read.Close() - }() - require.NoError(t, err) + t.Cleanup(func() { _ = read.Close() }) + require.False(t, hdr.Owner().IsZero()) require.True(t, hdr.Owner() == account)