From 90685d8ef2cebad2d254a053dafc2ff2d0abc87a Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Fri, 10 Oct 2025 20:15:24 +0200 Subject: [PATCH] fix random failure in test cases Signed-off-by: Nicola Murino --- internal/common/protocol_test.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/internal/common/protocol_test.go b/internal/common/protocol_test.go index de76e5a8..f6a0be75 100644 --- a/internal/common/protocol_test.go +++ b/internal/common/protocol_test.go @@ -8405,6 +8405,8 @@ func TestRetentionAPI(t *testing.T) { assert.NoError(t, err) err = client.Chtimes(uploadPath, time.Now().Add(-48*time.Hour), time.Now().Add(-48*time.Hour)) assert.NoError(t, err) + conn.Close() + client.Close() } // remove delete permissions to the user, it will be automatically granted @@ -8415,9 +8417,6 @@ func TestRetentionAPI(t *testing.T) { conn, client, err = getSftpClient(user) if assert.NoError(t, err) { - defer conn.Close() - defer client.Close() - innerUploadFilePath := path.Join("/"+testDir, testDir, testFileName) err = client.Mkdir(path.Join(testDir, testDir)) assert.NoError(t, err) @@ -8482,6 +8481,8 @@ func TestRetentionAPI(t *testing.T) { _, err = client.Stat(innerUploadFilePath) assert.ErrorIs(t, err, os.ErrNotExist) + conn.Close() + client.Close() } // finally test some errors removing files or folders if runtime.GOOS != osWindows { @@ -8553,6 +8554,10 @@ func TestRetentionAPI(t *testing.T) { assert.NoError(t, err) err = os.RemoveAll(user.GetHomeDir()) assert.NoError(t, err) + + assert.Eventually(t, func() bool { + return common.Connections.GetClientConnections() == 0 + }, 1*time.Second, 50*time.Millisecond) } func TestPerUserTransferLimits(t *testing.T) {