From d646f0d1e5b8dea5229a16f1f5b68fa72a19e52f Mon Sep 17 00:00:00 2001
From: Paolo Chila <paolo.chila@elastic.co>
Date: Mon, 18 Sep 2023 13:56:35 +0200
Subject: [PATCH] Fix TestRemovePath flakiness on windows

---
 internal/pkg/agent/install/uninstall.go       | 30 ++++++++-----------
 .../agent/install/uninstall_windows_test.go   |  8 +++--
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/internal/pkg/agent/install/uninstall.go b/internal/pkg/agent/install/uninstall.go
index 612a44587de..353190d9eec 100644
--- a/internal/pkg/agent/install/uninstall.go
+++ b/internal/pkg/agent/install/uninstall.go
@@ -99,27 +99,23 @@ func Uninstall(cfgFile, topPath, uninstallToken string) error {
 func RemovePath(path string) error {
 	const arbitraryTimeout = 5 * time.Second
 	start := time.Now()
-	nextSleep := 1 * time.Millisecond
-	for {
-		err := os.RemoveAll(path)
-		if err == nil {
-			return nil
-		}
-		if isBlockingOnExe(err) {
-			// try to remove the blocking exe
-			err = removeBlockingExe(err)
-		}
-		if err == nil {
-			return nil
-		}
-		if !isRetryableError(err) {
-			return err
+	var lastErr error
+	for time.Since(start) <= arbitraryTimeout {
+		lastErr = os.RemoveAll(path)
+
+		if lastErr == nil || !isRetryableError(lastErr) {
+			return lastErr
 		}
 
-		if d := time.Since(start) + nextSleep; d >= arbitraryTimeout {
-			return err
+		if isBlockingOnExe(lastErr) {
+			// try to remove the blocking exe and try again to clean up the path
+			removeBlockingExe(lastErr)
 		}
+
+		time.Sleep(time.Millisecond)
 	}
+
+	return fmt.Errorf("timed out while removing %q. Last error: %s", path, lastErr)
 }
 
 func RemoveBut(path string, bestEffort bool, exceptions ...string) error {
diff --git a/internal/pkg/agent/install/uninstall_windows_test.go b/internal/pkg/agent/install/uninstall_windows_test.go
index 513a8a3f622..a3a9f3a914f 100644
--- a/internal/pkg/agent/install/uninstall_windows_test.go
+++ b/internal/pkg/agent/install/uninstall_windows_test.go
@@ -7,12 +7,14 @@
 package install
 
 import (
+	"io/fs"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"testing"
 
 	"github.com/otiai10/copy"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -22,8 +24,6 @@ func TestRemovePath(t *testing.T) {
 		binaryName = pkgName + ".exe"
 	)
 
-	t.Skip("https://github.com/elastic/elastic-agent/issues/3221")
-
 	// Create a temporary directory that we can safely remove. The directory is created as a new
 	// sub-directory. This avoids having Microsoft Defender quarantine the file if it is exec'd from
 	// the default temporary directory.
@@ -51,5 +51,7 @@ func TestRemovePath(t *testing.T) {
 
 	// Ensure the directory containing the executable can be removed.
 	err = RemovePath(destDir)
-	require.NoError(t, err)
+	assert.NoError(t, err)
+	_, err = os.Stat(destDir)
+	assert.ErrorIsf(t, err, fs.ErrNotExist, "path %q still exists after removal", destDir)
 }