This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 20785746082ef0714d0e97c0ebc5162fdc6aacf6 Author: Raphael Ouazana <[email protected]> AuthorDate: Mon Jan 27 15:52:42 2020 +0100 [JAMES-2070] Fix LDAP disabled test --- .../user/ldap/ReadOnlyUsersLDAPRepositoryTest.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java index a1e7af8..e5e9484 100644 --- a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java +++ b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java @@ -133,8 +133,7 @@ public class ReadOnlyUsersLDAPRepositoryTest { } @Test - @Disabled("JAMES-2270 : pause issue after the fix in JAMES-2666") - public void testShouldStillWorksAfterRestartingLDAP() throws Exception { + public void testShouldStillWorkAfterRestartingLDAP() throws Exception { ReadOnlyUsersLDAPRepository ldapRepository = startUsersRepository(ldapRepositoryConfigurationWithVirtualHosting()); ldapRepository.test(JAMES_USER_MAIL, PASSWORD); @@ -203,10 +202,12 @@ public class ReadOnlyUsersLDAPRepositoryTest { configuration.addProperty("[@userBase]", "ou=People,dc=james,dc=org"); configuration.addProperty("[@userIdAttribute]", "uid"); configuration.addProperty("[@userObjectClass]", "inetOrgPerson"); - configuration.addProperty("[@maxRetries]", "4"); + configuration.addProperty("[@maxRetries]", "1"); configuration.addProperty("[@retryStartInterval]", "0"); - configuration.addProperty("[@retryMaxInterval]", "8"); - configuration.addProperty("[@retryIntervalScale]", "1000"); + configuration.addProperty("[@retryMaxInterval]", "2"); + configuration.addProperty("[@retryIntervalScale]", "100"); + configuration.addProperty("[@connectionTimeout]", "100"); + configuration.addProperty("[@readTimeout]", "100"); return configuration; } @@ -218,11 +219,13 @@ public class ReadOnlyUsersLDAPRepositoryTest { configuration.addProperty("[@userBase]", "ou=People,dc=james,dc=org"); configuration.addProperty("[@userIdAttribute]", "mail"); configuration.addProperty("[@userObjectClass]", "inetOrgPerson"); - configuration.addProperty("[@maxRetries]", "4"); + configuration.addProperty("[@maxRetries]", "1"); configuration.addProperty("[@retryStartInterval]", "0"); - configuration.addProperty("[@retryMaxInterval]", "8"); - configuration.addProperty("[@retryIntervalScale]", "1000"); + configuration.addProperty("[@retryMaxInterval]", "2"); + configuration.addProperty("[@retryIntervalScale]", "100"); configuration.addProperty("supportsVirtualHosting", true); + configuration.addProperty("[@connectionTimeout]", "100"); + configuration.addProperty("[@readTimeout]", "100"); return configuration; } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
