From 2b65adc15fe617fe0a61c49e7c99f39bab144985 Mon Sep 17 00:00:00 2001 From: mhajas Date: Thu, 8 Feb 2018 13:43:12 +0100 Subject: [PATCH] KEYCLOAK-6309 Fix tests Add trustore to war even if ssl is not enabled because HttpClient is configured with truststore --- .../testsuite/arquillian/DeploymentArchiveProcessor.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentArchiveProcessor.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentArchiveProcessor.java index 43fa9b9b11..eebb4b93e2 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentArchiveProcessor.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentArchiveProcessor.java @@ -160,9 +160,8 @@ public class DeploymentArchiveProcessor implements ApplicationArchiveProcessor { archive.add(new StringAsset(IOUtil.documentToString(doc)), adapterConfigPath); - if (APP_SERVER_SSL_REQUIRED) { - ((WebArchive) archive).addAsResource(new File(DeploymentArchiveProcessor.class.getResource("/keystore/keycloak.truststore").getFile())); - } + ((WebArchive) archive).addAsResource(new File(DeploymentArchiveProcessor.class.getResource("/keystore/keycloak.truststore").getFile())); + // For running SAML tests it is necessary to have few dependencies on app-server side. // Few of them are not in adapter zip so we need to add them manually here } else { // OIDC adapter config