From b3ea6f74beb2bb0fa625e0cd438ce72bb97ff465 Mon Sep 17 00:00:00 2001 From: Lukas Hanusovsky Date: Thu, 4 Mar 2021 15:51:10 +0100 Subject: [PATCH] KEYCLOAK-16212 - Exclude Remote execution for the LDAPVaultCredentialsTest, fixed broken exclude Remote execution for the LDAPUserLoginTest. --- .../testsuite/federation/ldap/LDAPUserLoginTest.java | 6 +++--- .../testsuite/federation/ldap/LDAPVaultCredentialsTest.java | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserLoginTest.java index db55d9e41b..1297b345e6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserLoginTest.java @@ -227,7 +227,7 @@ public class LDAPUserLoginTest extends AbstractLDAPTest { // Test variant: Bind credential set to vault @Test @LDAPConnectionParameters(bindCredential=LDAPConnectionParameters.BindCredential.VAULT, bindType=LDAPConnectionParameters.BindType.SIMPLE, encryption=LDAPConnectionParameters.Encryption.NONE) - @AuthServerContainerExclude(value = AuthServerContainerExclude.AuthServer.QUARKUS, details = + @AuthServerContainerExclude(value = {AuthServerContainerExclude.AuthServer.QUARKUS, AuthServerContainerExclude.AuthServer.REMOTE}, details = "java.io.NotSerializableException: com.sun.jndi.ldap.LdapCtx") public void loginLDAPUserCredentialVaultAuthenticationSimpleEncryptionNone() { verifyConnectionUrlProtocolPrefix("ldap://"); @@ -247,7 +247,7 @@ public class LDAPUserLoginTest extends AbstractLDAPTest { // Test variant: Bind credential set to vault @Test @LDAPConnectionParameters(bindCredential=LDAPConnectionParameters.BindCredential.VAULT, bindType=LDAPConnectionParameters.BindType.SIMPLE, encryption=LDAPConnectionParameters.Encryption.SSL) - @AuthServerContainerExclude(value = AuthServerContainerExclude.AuthServer.QUARKUS, details = + @AuthServerContainerExclude(value = {AuthServerContainerExclude.AuthServer.QUARKUS, AuthServerContainerExclude.AuthServer.REMOTE}, details = "java.io.NotSerializableException: com.sun.jndi.ldap.LdapCtx") public void loginLDAPUserCredentialVaultAuthenticationSimpleEncryptionSSL() { verifyConnectionUrlProtocolPrefix("ldaps://"); @@ -267,7 +267,7 @@ public class LDAPUserLoginTest extends AbstractLDAPTest { // Test variant: Bind credential set to vault @Test @LDAPConnectionParameters(bindCredential=LDAPConnectionParameters.BindCredential.VAULT, bindType=LDAPConnectionParameters.BindType.SIMPLE, encryption=LDAPConnectionParameters.Encryption.STARTTLS) - @AuthServerContainerExclude(value = AuthServerContainerExclude.AuthServer.QUARKUS, details = + @AuthServerContainerExclude(value = {AuthServerContainerExclude.AuthServer.QUARKUS, AuthServerContainerExclude.AuthServer.REMOTE}, details = "java.io.NotSerializableException: com.sun.jndi.ldap.LdapCtx") public void loginLDAPUserCredentialVaultAuthenticationSimpleEncryptionStartTLS() { verifyConnectionUrlProtocolPrefix("ldap://"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPVaultCredentialsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPVaultCredentialsTest.java index 559b9e4d60..8db0ffa781 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPVaultCredentialsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPVaultCredentialsTest.java @@ -14,8 +14,7 @@ import static org.keycloak.models.LDAPConstants.BIND_CREDENTIAL; * @author mhajas */ @EnableVault -@AuthServerContainerExclude(value = AuthServerContainerExclude.AuthServer.QUARKUS, details = - "java.io.NotSerializableException: com.sun.jndi.ldap.LdapCtx") +@AuthServerContainerExclude(value = {AuthServerContainerExclude.AuthServer.QUARKUS, AuthServerContainerExclude.AuthServer.REMOTE}, details = "java.io.NotSerializableException: com.sun.jndi.ldap.LdapCtx") public class LDAPVaultCredentialsTest extends LDAPSyncTest { private static final String VAULT_EXPRESSION = "${vault.ldap_bindCredential}";