From fb8adb4a1c6c3d8a4f8074dbffae7ee92e97e1cd Mon Sep 17 00:00:00 2001 From: Albert Zaharovits Date: Fri, 9 Feb 2018 13:54:59 +0200 Subject: [PATCH] [Security][Tests] Azeri(Turkish) locale tripps opensaml dependency Original commit: elastic/x-pack-elasticsearch@9c4ecabe4846d32820980b48545a69bd4492eafa --- .../xpack/security/authc/saml/SamlTestCase.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/saml/SamlTestCase.java b/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/saml/SamlTestCase.java index 8bfe001e4c1..7087dafca78 100644 --- a/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/saml/SamlTestCase.java +++ b/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/saml/SamlTestCase.java @@ -37,7 +37,7 @@ public abstract class SamlTestCase extends ESTestCase { Logger logger = Loggers.getLogger(SamlTestCase.class); if (isTurkishLocale()) { // See: https://github.com/elastic/x-pack-elasticsearch/issues/2815 - logger.warn("Attempting to run SAML test on turkish locale, but that breaks OpenSAML. Switching to English."); + logger.warn("Attempting to run SAML test on turkish-like locale, but that breaks OpenSAML. Switching to English."); restoreLocale = Locale.getDefault(); Locale.setDefault(Locale.ENGLISH); } @@ -45,7 +45,8 @@ public abstract class SamlTestCase extends ESTestCase { } private static boolean isTurkishLocale() { - return Locale.getDefault().getLanguage().equals(new Locale("tr").getLanguage()); + return Locale.getDefault().getLanguage().equals(new Locale("tr").getLanguage()) + || Locale.getDefault().getLanguage().equals(new Locale("az").getLanguage()); } @AfterClass