KEYCLOAK-2886 Turn off clustered tests from IDE
This commit is contained in:
parent
b80b480769
commit
3918dbed59
4 changed files with 25 additions and 18 deletions
|
@ -70,28 +70,28 @@ public class AuthServerTestEnricher {
|
|||
private Event<StopContainer> stopContainerEvent;
|
||||
|
||||
public static final String AUTH_SERVER_CONTAINER_DEFAULT = "auth-server-undertow";
|
||||
private static final String AUTH_SERVER_CONTAINER_PROPERTY = "auth.server.container";
|
||||
public static final String AUTH_SERVER_CONTAINER_PROPERTY = "auth.server.container";
|
||||
public static final String AUTH_SERVER_CONTAINER = System.getProperty(AUTH_SERVER_CONTAINER_PROPERTY, AUTH_SERVER_CONTAINER_DEFAULT);
|
||||
|
||||
private static final String AUTH_SERVER_BACKEND_DEFAULT = AUTH_SERVER_CONTAINER + "-backend";
|
||||
private static final String AUTH_SERVER_BACKEND_PROPERTY = "auth.server.backend";
|
||||
public static final String AUTH_SERVER_BACKEND_DEFAULT = AUTH_SERVER_CONTAINER + "-backend";
|
||||
public static final String AUTH_SERVER_BACKEND_PROPERTY = "auth.server.backend";
|
||||
public static final String AUTH_SERVER_BACKEND = System.getProperty(AUTH_SERVER_BACKEND_PROPERTY, AUTH_SERVER_BACKEND_DEFAULT);
|
||||
|
||||
private static final String AUTH_SERVER_BALANCER_DEFAULT = "auth-server-balancer";
|
||||
private static final String AUTH_SERVER_BALANCER_PROPERTY = "auth.server.balancer";
|
||||
public static final String AUTH_SERVER_BALANCER_DEFAULT = "auth-server-balancer";
|
||||
public static final String AUTH_SERVER_BALANCER_PROPERTY = "auth.server.balancer";
|
||||
public static final String AUTH_SERVER_BALANCER = System.getProperty(AUTH_SERVER_BALANCER_PROPERTY, AUTH_SERVER_BALANCER_DEFAULT);
|
||||
|
||||
private static final String AUTH_SERVER_CLUSTER_PROPERTY = "auth.server.cluster";
|
||||
public static final String AUTH_SERVER_CLUSTER_PROPERTY = "auth.server.cluster";
|
||||
public static final boolean AUTH_SERVER_CLUSTER = Boolean.parseBoolean(System.getProperty(AUTH_SERVER_CLUSTER_PROPERTY, "false"));
|
||||
private static final String AUTH_SERVER_CROSS_DC_PROPERTY = "auth.server.crossdc";
|
||||
public static final String AUTH_SERVER_CROSS_DC_PROPERTY = "auth.server.crossdc";
|
||||
public static final boolean AUTH_SERVER_CROSS_DC = Boolean.parseBoolean(System.getProperty(AUTH_SERVER_CROSS_DC_PROPERTY, "false"));
|
||||
|
||||
private static final Boolean START_MIGRATION_CONTAINER = "auto".equals(System.getProperty("migration.mode")) ||
|
||||
public static final Boolean START_MIGRATION_CONTAINER = "auto".equals(System.getProperty("migration.mode")) ||
|
||||
"manual".equals(System.getProperty("migration.mode"));
|
||||
|
||||
// In manual mode are all containers despite loadbalancers started in mode "manual" and nothing is managed through "suite".
|
||||
// Useful for tests, which require restart servers etc.
|
||||
private static final String MANUAL_MODE = "manual.mode";
|
||||
public static final String MANUAL_MODE = "manual.mode";
|
||||
|
||||
@Inject
|
||||
@SuiteScoped
|
||||
|
|
|
@ -32,6 +32,12 @@ public class ContainerAssume {
|
|||
AuthServerTestEnricher.AUTH_SERVER_CONTAINER.equals(AuthServerTestEnricher.AUTH_SERVER_CONTAINER_DEFAULT));
|
||||
}
|
||||
|
||||
public static void assumeClusteredContainer() {
|
||||
Assume.assumeTrue(
|
||||
String.format("Ignoring test since %s is set to false",
|
||||
AuthServerTestEnricher.AUTH_SERVER_CLUSTER_PROPERTY), AuthServerTestEnricher.AUTH_SERVER_CLUSTER);
|
||||
}
|
||||
|
||||
public static void assumeNotAppServerUndertow() {
|
||||
log.warn("TODO: Not stable on app-server-undertow. "
|
||||
+ "It throws: KC-SERVICES0057: Logout for client '${CLIENT_NAME}' failed\n"
|
||||
|
|
|
@ -3,12 +3,14 @@ package org.keycloak.testsuite.cluster;
|
|||
import org.jboss.arquillian.container.test.api.ContainerController;
|
||||
import org.jboss.arquillian.test.api.ArquillianResource;
|
||||
import org.junit.Before;
|
||||
import org.junit.BeforeClass;
|
||||
import org.keycloak.admin.client.Keycloak;
|
||||
import org.keycloak.models.Constants;
|
||||
import org.keycloak.representations.idm.RealmRepresentation;
|
||||
import org.keycloak.testsuite.AbstractKeycloakTest;
|
||||
import org.keycloak.testsuite.arquillian.ContainerInfo;
|
||||
import org.keycloak.testsuite.client.KeycloakTestingClient;
|
||||
import org.keycloak.testsuite.util.ContainerAssume;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
|
@ -153,6 +155,11 @@ public abstract class AbstractClusterTest extends AbstractKeycloakTest {
|
|||
return testingClient;
|
||||
}
|
||||
|
||||
@BeforeClass
|
||||
public static void enabled() {
|
||||
ContainerAssume.assumeClusteredContainer();
|
||||
}
|
||||
|
||||
@Before
|
||||
public void beforeClusterTest() {
|
||||
failback();
|
||||
|
|
|
@ -891,9 +891,6 @@
|
|||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
|
@ -964,9 +961,6 @@
|
|||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
|
@ -1083,9 +1077,6 @@
|
|||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
|
@ -1713,6 +1704,9 @@
|
|||
<plugin>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>xml-maven-plugin</artifactId>
|
||||
|
|
Loading…
Reference in a new issue