keycloak-memoizeit

Merge pull request #330 from mposolda/master Fix LDAP test

4/9/2014 2:44:57 PM

Details

diff --git a/model/tests/src/main/java/org/keycloak/model/test/LDAPEmbeddedServer.java b/model/tests/src/main/java/org/keycloak/model/test/LDAPEmbeddedServer.java
index 44a172a..0598c42 100644
--- a/model/tests/src/main/java/org/keycloak/model/test/LDAPEmbeddedServer.java
+++ b/model/tests/src/main/java/org/keycloak/model/test/LDAPEmbeddedServer.java
@@ -1,5 +1,6 @@
 package org.keycloak.model.test;
 
+import java.io.File;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -90,6 +91,13 @@ public class LDAPEmbeddedServer extends AbstractLDAPTest {
     public void setup() throws Exception {
         // suppress emb. LDAP server start
         if (isStartEmbeddedLdapLerver()) {
+            // On Windows, the directory may not be fully deleted from previous test
+            String tempDir = System.getProperty("java.io.tmpdir");
+            File workDir = new File(tempDir + "/server-work");
+            if (workDir.exists()) {
+                recursiveDeleteDir(workDir);
+            }
+
             super.setup();
         }
     }