Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WFCORE-4538] Disabling SSL & SASL failing tests for now on JDK13+ #3832

Merged
merged 1 commit into from
Jun 21, 2019
Merged

[WFCORE-4538] Disabling SSL & SASL failing tests for now on JDK13+ #3832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 14 additions & 1 deletion elytron/src/test/java/org/wildfly/extension/elytron/TlsTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
import org.jboss.msc.service.ServiceName;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
Expand Down Expand Up @@ -280,8 +281,19 @@ private static void deleteKeyStoreFiles() {
}


@BeforeClass
public static void noJDK13Plus() {
Assume.assumeFalse("Avoiding JDK 13 due to https://issues.jboss.org/browse/WFCORE-4532", "13".equals(System.getProperty("java.specification.version")));
Assume.assumeFalse("Avoiding JDK 14 due to https://issues.jboss.org/browse/WFCORE-4532", "14".equals(System.getProperty("java.specification.version")));
}

private static boolean isJDK13Plus() {
return "13".equals(System.getProperty("java.specification.version")) || "14".equals(System.getProperty("java.specification.version"));
}

@BeforeClass
public static void initTests() throws Exception {
if (isJDK13Plus()) return; // TODO: remove this line once WFCORE-4532 is fixed
setUpKeyStores();
AccessController.doPrivileged((PrivilegedAction<Integer>) () -> Security.insertProviderAt(wildFlyElytronProvider, 1));
csUtil = new CredentialStoreUtility("target/tlstest.keystore");
Expand All @@ -291,6 +303,7 @@ public static void initTests() throws Exception {

@AfterClass
public static void cleanUpTests() {
if (isJDK13Plus()) return; // TODO: remove this line once WFCORE-4532 is fixed
deleteKeyStoreFiles();
csUtil.cleanUp();
AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
Expand Down Expand Up @@ -542,4 +555,4 @@ private void testSessionsReading(String serverContextName, String clientContextN
Assert.assertEquals(expectedServerPrincipal, result.get(0).get(ElytronDescriptionConstants.SUBJECT).asString());
}
}
}
}
8 changes: 8 additions & 0 deletions ...est/java/org/wildfly/test/integration/elytron/sasl/mgmt/KerberosHttpMgmtSaslTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
import org.jboss.as.test.integration.security.common.CoreUtils;
import org.jboss.as.test.shared.TestSuiteEnvironment;
import org.jboss.dmr.ModelNode;
import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.wildfly.core.testrunner.WildflyTestRunner;
import org.wildfly.security.auth.permission.LoginPermission;
Expand Down Expand Up @@ -75,6 +77,12 @@ public class KerberosHttpMgmtSaslTestCase extends AbstractKerberosMgmtSaslTestBa

private static final String NAME = KerberosHttpMgmtSaslTestCase.class.getSimpleName();

@BeforeClass
public static void noJDK13Plus() {
Assume.assumeFalse("Avoiding JDK 13 due to https://issues.jboss.org/browse/WFCORE-4532", "13".equals(System.getProperty("java.specification.version")));
Assume.assumeFalse("Avoiding JDK 14 due to https://issues.jboss.org/browse/WFCORE-4532", "14".equals(System.getProperty("java.specification.version")));
}

private static final ModelControllerClient client = ModelControllerClient.Factory
.create(new ModelControllerClientConfiguration.Builder().setHostName(CoreUtils.getDefaultHost(false))
.setPort(PORT_NATIVE).setProtocol("remote").setConnectionTimeout(CONNECTION_TIMEOUT_IN_MS).build());
Expand Down
8 changes: 8 additions & 0 deletions ...t/java/org/wildfly/test/integration/elytron/sasl/mgmt/KerberosNativeMgmtSaslTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
import org.jboss.as.test.shared.TestSuiteEnvironment;
import org.jboss.dmr.ModelNode;
import org.junit.runner.RunWith;
import org.junit.Assume;
import org.junit.BeforeClass;
import org.wildfly.core.testrunner.WildflyTestRunner;
import org.wildfly.security.auth.permission.LoginPermission;
import org.wildfly.test.security.common.TestRunnerConfigSetupTask;
Expand Down Expand Up @@ -74,6 +76,12 @@ public class KerberosNativeMgmtSaslTestCase extends AbstractKerberosMgmtSaslTest

private static final String NAME = KerberosNativeMgmtSaslTestCase.class.getSimpleName();

@BeforeClass
public static void noJDK13Plus() {
Assume.assumeFalse("Avoiding JDK 13 due to https://issues.jboss.org/browse/WFCORE-4532", "13".equals(System.getProperty("java.specification.version")));
Assume.assumeFalse("Avoiding JDK 14 due to https://issues.jboss.org/browse/WFCORE-4532", "14".equals(System.getProperty("java.specification.version")));
}

/**
* Configures test sasl-server-factory to use given mechanism. It also enables/disables SSL based on provided flag.
*/
Expand Down