fix: Retry the file deletion to prevent flakies for issue #938

Author: lazysegtree

src/internal/handle_file_operation_test.go

@@ -141,6 +141,21 @@ func TestCompressSelectedFiles(t *testing.T) {
 			p.SendKey(common.Hotkeys.ExtractFile[0])
 			// File extraction is supposedly async. So function's return doesn't means its done.
 			extractedDir := filepath.Join(tt.startDir, tt.extractedDirName)
+
+			// Setup cleanup to run even if test fails
+			t.Cleanup(func() {
+				var rmExtractErr error
+				require.Eventually(t, func() bool {
+					rmExtractErr = os.RemoveAll(extractedDir)
+					return rmExtractErr == nil
+				}, DefaultTestTimeout, DefaultTestTick, "Failed to remove extracted directory %q: %v", extractedDir, rmExtractErr)
+
+				var rmZipErr error
+				require.Eventually(t, func() bool {
+					rmZipErr = os.RemoveAll(zipFile)
+					return rmZipErr == nil
+				}, DefaultTestTimeout, DefaultTestTick, "Failed to remove zip file %q: %v", zipFile, rmZipErr)
+			})
 			assert.Eventually(t, func() bool {
 				for _, f := range tt.expectedFilesAfterExtract {
 					_, err := os.Stat(filepath.Join(extractedDir, f))
@@ -152,8 +167,6 @@ func TestCompressSelectedFiles(t *testing.T) {
 			}, DefaultTestTimeout, DefaultTestTick, "Extraction of files failed Required - [%s]+%v",
 				extractedDir, tt.expectedFilesAfterExtract)
 
-			require.NoError(t, os.RemoveAll(extractedDir))
-			require.NoError(t, os.RemoveAll(zipFile))
 		})
 	}