From eb378909247e25bf4cb2ec9db01b03980693bf09 Mon Sep 17 00:00:00 2001 From: mposolda Date: Wed, 9 Apr 2014 18:18:26 +0200 Subject: [PATCH] Fix LDAP test on windows. Ensure that directory with data for embedded ApacheDS is deleted --- .../java/org/keycloak/model/test/LDAPEmbeddedServer.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 44a172a2e53..0598c421542 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(); } }