From 67f473a9927621bdbfc34fdd3df8dfca156cd358 Mon Sep 17 00:00:00 2001 From: jaymode Date: Mon, 18 Jul 2016 11:20:52 -0400 Subject: [PATCH] test: mute ldap timeout tests See elastic/elasticsearch#2849 Original commit: elastic/x-pack-elasticsearch@318307073e02ca7e2bcf5df4e0ef29e5f99261bc --- .../xpack/security/authc/ldap/LdapSessionFactory.java | 2 -- .../xpack/security/authc/ldap/LdapSessionFactoryTests.java | 2 +- .../elasticsearch/xpack/security/authc/ldap/OpenLdapTests.java | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactory.java b/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactory.java index e7c2d99b71c..5ffd2a52304 100644 --- a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactory.java +++ b/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactory.java @@ -14,9 +14,7 @@ import org.elasticsearch.xpack.security.authc.ldap.support.LdapSession.GroupsRes import org.elasticsearch.xpack.security.authc.ldap.support.SessionFactory; import org.elasticsearch.xpack.security.authc.support.SecuredString; import org.elasticsearch.xpack.security.ssl.ClientSSLService; -import org.elasticsearch.xpack.security.support.Exceptions; -import java.io.IOException; import java.text.MessageFormat; import java.util.Locale; diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactoryTests.java b/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactoryTests.java index f5cd1250fc3..c6c161d9ec4 100644 --- a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactoryTests.java +++ b/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactoryTests.java @@ -19,7 +19,6 @@ import org.elasticsearch.xpack.security.authc.support.SecuredStringTests; import org.elasticsearch.test.junit.annotations.Network; import org.junit.Before; -import java.io.IOException; import java.util.List; import static org.hamcrest.Matchers.anyOf; @@ -66,6 +65,7 @@ public class LdapSessionFactoryTests extends LdapTestCase { } @Network + @AwaitsFix(bugUrl = "https://github.com/elastic/x-plugins/issues/2849") public void testConnectTimeout() { // Local sockets connect too fast... String ldapUrl = "ldap://54.200.235.244:389"; diff --git a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/OpenLdapTests.java b/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/OpenLdapTests.java index d3c7facba65..66491145d82 100644 --- a/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/OpenLdapTests.java +++ b/elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/OpenLdapTests.java @@ -142,6 +142,7 @@ public class OpenLdapTests extends ESTestCase { } } + @AwaitsFix(bugUrl = "https://github.com/elastic/x-plugins/issues/2849") public void testTcpTimeout() throws Exception { String groupSearchBase = "ou=people,dc=oldap,dc=test,dc=elasticsearch,dc=com"; String userTemplate = "uid={0},ou=people,dc=oldap,dc=test,dc=elasticsearch,dc=com";