Merge pull request #334 from mposolda/master

Reenable AuthProvidersIntegrationTest.registerUserLdapSuccess. Add varia...
This commit is contained in:
Bill Burke 2014-04-10 12:16:08 -04:00
commit 0896808625
3 changed files with 8 additions and 5 deletions

View file

@ -80,7 +80,6 @@
<dependency> <dependency>
<groupId>com.google.zxing</groupId> <groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId> <artifactId>javase</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
@ -192,7 +191,6 @@
<dependency> <dependency>
<groupId>org.freemarker</groupId> <groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId> <artifactId>freemarker</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>

View file

@ -3,7 +3,6 @@ package org.keycloak.testsuite.forms;
import org.junit.Assert; import org.junit.Assert;
import org.junit.ClassRule; import org.junit.ClassRule;
import org.junit.FixMethodOrder; import org.junit.FixMethodOrder;
import org.junit.Ignore;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.RuleChain; import org.junit.rules.RuleChain;
@ -25,7 +24,6 @@ import org.keycloak.testsuite.pages.AccountUpdateProfilePage;
import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage;
import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.LoginPage;
import org.keycloak.testsuite.pages.RegisterPage; import org.keycloak.testsuite.pages.RegisterPage;
import org.keycloak.testsuite.rule.AbstractKeycloakRule;
import org.keycloak.testsuite.rule.KeycloakRule; import org.keycloak.testsuite.rule.KeycloakRule;
import org.keycloak.testsuite.rule.LDAPRule; import org.keycloak.testsuite.rule.LDAPRule;
import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebResource;
@ -218,7 +216,6 @@ public class AuthProvidersIntegrationTest {
} }
@Test @Test
@Ignore
public void registerUserLdapSuccess() { public void registerUserLdapSuccess() {
loginPage.open(); loginPage.open();
loginPage.clickRegister(); loginPage.clickRegister();

View file

@ -113,6 +113,14 @@ public abstract class AbstractKeycloakRule extends ExternalResource {
@Override @Override
protected void after() { protected void after() {
server.stop(); server.stop();
// Add some variable delay (Some windows envs have issues as server is not stopped immediately after server.stop)
try {
int sleepInterval = Integer.parseInt(System.getProperty("testsuite.delay", "0"));
Thread.sleep(sleepInterval);
} catch (InterruptedException ie) {
Thread.currentThread().interrupt();
}
} }
public RealmRepresentation loadJson(String path) throws IOException { public RealmRepresentation loadJson(String path) throws IOException {