Cleanup repositories in LocalRepositoryTestCase

Repository instances are now closed in method afterClassBase.
Deletion of files is retried if files are locked.
File.deleteOnExit() is no longer used. This guarantees a proper shutdown
of the test class.

Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>

1 files changed, 22 insertions, 3 deletions

diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java
index 65df972a39..28988afae0 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java
@@ -22,6 +22,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.egit.core.Activator;
+import org.eclipse.egit.core.RepositoryCache;
 import org.eclipse.egit.core.op.CloneOperation;
 import org.eclipse.egit.core.op.CommitOperation;
 import org.eclipse.egit.core.op.ConnectProviderOperation;
@@ -135,19 +136,37 @@ public abstract class LocalRepositoryTestCase extends EGitTestCase {
 		new Eclipse().reset();
 		// cleanup
 		deleteAllProjects();
+		shutDownRepositories();
 		deleteRecursive(testDirectory);
 		Activator.getDefault().getRepositoryCache().clear();
 	}
 
-	protected static void deleteRecursive(File dirOrFile) {
+	private static void shutDownRepositories() {
+		RepositoryCache cache = Activator.getDefault().getRepositoryCache();
+		for(Repository repository:cache.getAllRepositories())
+			repository.close();
+		cache.clear();
+	}
+
+	protected static void deleteRecursive(File dirOrFile) throws IOException {
 		if (dirOrFile.isDirectory()) {
 			for (File file : dirOrFile.listFiles()) {
 				deleteRecursive(file);
 			}
 		}
-		boolean deleted = dirOrFile.delete();
+		boolean deleted = false;
+		for(int i=0; i<10; i++) {
+			deleted = dirOrFile.delete();
+			if (deleted)
+				break;
+			try {
+				Thread.sleep(100);
+			} catch (InterruptedException e) {
+				// ignore
+			}
+		}
 		if (!deleted) {
-			dirOrFile.deleteOnExit();
+			throw new IOException("could not delete " + dirOrFile.getPath());
 		}
 	}