libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Merge pull request #4756 from tkyjovsk/KEYCLOAK-5922

Browse source 
KEYCLOAK-5922 Cluster tests don't work with non-undertow server
This commit is contained in:
Pavel Drozd 2017-11-30 09:24:39 +01:00 committed by GitHub
commit 4408cdb5c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
testsuite/integration-arquillian/servers/wildfly-balancer/src/main/xslt/mod_cluster.xsl
View file

@ -67,7 +67,7 @@
<xsl:template match="//*[local-name()='socket-binding-group' and @name='standard-sockets']"> <xsl:template match="//*[local-name()='socket-binding-group' and @name='standard-sockets']">
<xsl:copy> <xsl:copy>
<xsl:apply-templates select="node()|@*"/> <xsl:apply-templates select="node()|@*"/>
<socket-binding name="modcluster" interface="private" port="23364" multicast-address="${{jboss.default.multicast.address:230.0.0.4}}"/> <socket-binding name="modcluster" interface="private" port="23364" multicast-address="${{jboss.default.multicast.address:230.0.0.4}}" multicast-port="23364" />
</xsl:copy> </xsl:copy>
</xsl:template> </xsl:template>

13
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java
View file

@ -216,12 +216,13 @@ public class AuthServerTestEnricher {
suiteContext.setAuthServerInfo(container); suiteContext.setAuthServerInfo(container);
containers.stream() containers.stream()
.filter(c -> c.getQualifier().startsWith(AUTH_SERVER_BACKEND)) .filter(c -> c.getQualifier().startsWith(AUTH_SERVER_BACKEND))
.forEach(c -> { .sorted((a, b) -> a.getQualifier().compareTo(b.getQualifier())) // ordering is expected by the cluster tests
String portOffsetString = c.getArquillianContainer().getContainerConfiguration().getContainerProperties().getOrDefault("bindHttpPortOffset", "0"); .forEach(c -> {
updateWithAuthServerInfo(c, Integer.valueOf(portOffsetString)); int portOffset = Integer.parseInt(c.getQualifier().substring(AUTH_SERVER_BACKEND.length()));
suiteContext.addAuthServerBackendsInfo(0, c); updateWithAuthServerInfo(c, portOffset);
}); suiteContext.addAuthServerBackendsInfo(0, c);
});
if (suiteContext.getAuthServerBackendsInfo().isEmpty()) { if (suiteContext.getAuthServerBackendsInfo().isEmpty()) {
throw new RuntimeException(String.format("No auth server container matching '%s' found in arquillian.xml.", AUTH_SERVER_BACKEND)); throw new RuntimeException(String.format("No auth server container matching '%s' found in arquillian.xml.", AUTH_SERVER_BACKEND));

4
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/SuiteContext.java
View file

@ -180,10 +180,10 @@ public final class SuiteContext {
} }
} else if (isAuthServerCluster()) { } else if (isAuthServerCluster()) {
sb.append(isAuthServerCluster() ? "\nFrontend: " : "") sb.append(isAuthServerCluster() ? "\nFrontend: " : "")
.append(getAuthServerInfo().getQualifier()) .append(getAuthServerInfo().getQualifier()).append(" - ").append(getAuthServerInfo().getContextRoot().toExternalForm())
.append("\n"); .append("\n");
getAuthServerBackendsInfo().forEach(bInfo -> sb.append(" Backend: ").append(bInfo).append("\n")); getAuthServerBackendsInfo().forEach(bInfo -> sb.append(" Backend: ").append(bInfo).append(" - ").append(bInfo.getContextRoot().toExternalForm()).append("\n"));
} else { } else {
sb.append(getAuthServerInfo().getQualifier()) sb.append(getAuthServerInfo().getQualifier())
.append("\n"); .append("\n");