Skip to content

Fix SimpleKdcLdapServerTests by overriding java.locale.providers #60447

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

Merged
merged 3 commits into from
Jul 31, 2020
Merged

Fix SimpleKdcLdapServerTests by overriding java.locale.providers #60447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f745884
Fix SimpleKdcLdapServerTests by overriding java.locale.providers
ywangd Jul 30, 2020
2174fd0
Address feedback
ywangd Jul 30, 2020
2ecf834
Checkstyle
ywangd Jul 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions x-pack/qa/evil-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ dependencies {
}

unitTest {
if (project.runtimeJavaVersion >= JavaVersion.VERSION_1_9) {
systemProperty 'java.locale.providers', 'COMPAT'
}
systemProperty 'tests.security.manager', 'false'
include '**/*Tests.class'
}
4 changes: 0 additions & 4 deletions ...c/test/java/org/elasticsearch/xpack/security/authc/kerberos/SimpleKdcLdapServerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import com.unboundid.ldap.sdk.SearchScope;

import org.elasticsearch.action.support.PlainActionFuture;
import org.elasticsearch.bootstrap.JavaVersion;
import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.settings.SecureString;
import org.elasticsearch.env.Environment;
Expand Down Expand Up @@ -51,9 +50,6 @@ public void testPrincipalCreationAndSearchOnLdap() throws Exception {
}

public void testClientServiceMutualAuthentication() throws PrivilegedActionException, GSSException, LoginException, ParseException {
assumeFalse("Java 15-ea causes issues with this test, see https://github.com/elastic/elasticsearch/issues/57749",
JavaVersion.current().compareTo(JavaVersion.parse("15")) >= 0);

final String serviceUserName = randomFrom(serviceUserNames);
// Client login and init token preparation
final String clientUserName = randomFrom(clientUserNames);
Expand Down