From 861165909c581fbb6c3cd27304ceca61d2c97675 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 17 Nov 2021 19:09:06 +0100 Subject: [PATCH] TestUtils#deleteTempDirs: don't throw exception when cleanup fails This now happened frequently on Eclipse CI systems failing tests unnecessarily. Change-Id: I651ba084c336db8ef6d51a5c50c6ae1bc478b152 --- .../src/org/eclipse/egit/core/test/TestUtils.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/org.eclipse.egit.core.junit/src/org/eclipse/egit/core/test/TestUtils.java b/org.eclipse.egit.core.junit/src/org/eclipse/egit/core/test/TestUtils.java index 57ad7b4ac..66f5ed2f6 100644 --- a/org.eclipse.egit.core.junit/src/org/eclipse/egit/core/test/TestUtils.java +++ b/org.eclipse.egit.core.junit/src/org/eclipse/egit/core/test/TestUtils.java @@ -25,7 +25,6 @@ import java.lang.management.LockInfo; import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; import java.lang.management.ThreadMXBean; -import java.nio.file.DirectoryNotEmptyException; import java.nio.file.FileVisitResult; import java.nio.file.Files; import java.nio.file.SimpleFileVisitor; @@ -131,14 +130,8 @@ public class TestUtils { */ public void deleteTempDirs() throws IOException { if (rootDir.exists()) { - try { - FileUtils.delete(rootDir, - FileUtils.RECURSIVE | FileUtils.RETRY); - } catch (DirectoryNotEmptyException e) { - System.err.println(e.toString()); - listDirectory(rootDir, true); - throw e; - } + FileUtils.delete(rootDir, FileUtils.RECURSIVE | FileUtils.RETRY + | FileUtils.IGNORE_ERRORS); } } -- 2.11.4.GIT