Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5DE14D312 for ; Thu, 16 May 2013 12:45:46 +0000 (UTC) Received: (qmail 64291 invoked by uid 500); 16 May 2013 12:45:42 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 61561 invoked by uid 500); 16 May 2013 12:45:20 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 61126 invoked by uid 99); 16 May 2013 12:45:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 May 2013 12:45:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 May 2013 12:44:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2F91023889DA; Thu, 16 May 2013 12:44:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1483320 - /directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/DelegatedAuthIT.java Date: Thu, 16 May 2013 12:44:37 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130516124437.2F91023889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Thu May 16 12:44:36 2013 New Revision: 1483320 URL: http://svn.apache.org/r1483320 Log: Fixed a broken test : we were having an infinite loop in delegation... Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/DelegatedAuthIT.java Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/DelegatedAuthIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/DelegatedAuthIT.java?rev=1483320&r1=1483319&r2=1483320&view=diff ============================================================================== --- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/DelegatedAuthIT.java (original) +++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/DelegatedAuthIT.java Thu May 16 12:44:36 2013 @@ -25,7 +25,6 @@ import static org.junit.Assert.assertTru import static org.junit.Assert.fail; import org.apache.directory.api.ldap.model.exception.LdapAuthenticationException; -import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.ldap.client.api.LdapNetworkConnection; import org.apache.directory.server.annotations.CreateLdapServer; @@ -33,13 +32,9 @@ import org.apache.directory.server.annot import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.annotations.CreateAuthenticator; import org.apache.directory.server.core.annotations.CreateDS; -import org.apache.directory.server.core.authn.AnonymousAuthenticator; import org.apache.directory.server.core.authn.DelegatingAuthenticator; -import org.apache.directory.server.core.authn.SimpleAuthenticator; -import org.apache.directory.server.core.authn.StrongAuthenticator; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -79,10 +74,8 @@ import org.junit.runner.RunWith; allowAnonymousAccess = true) public class DelegatedAuthIT extends AbstractLdapTestUnit { - @Rule - public MultiThreadedMultiInvoker i = new MultiThreadedMultiInvoker( MultiThreadedMultiInvoker.NOT_THREADSAFE ); - - + //@Rule + //public MultiThreadedMultiInvoker i = new MultiThreadedMultiInvoker( MultiThreadedMultiInvoker.NOT_THREADSAFE ); /** * Test with bindDn which is not even found under any namingContext of the * server. @@ -157,16 +150,7 @@ public class DelegatedAuthIT extends Abs */ @CreateDS( allowAnonAccess = true, - name = "DelegatedAuthIT-MultipleAuthenticators-method", - authenticators = - { - @CreateAuthenticator(type = AnonymousAuthenticator.class), - @CreateAuthenticator(type = SimpleAuthenticator.class), - @CreateAuthenticator( - type = DelegatingAuthenticator.class, - delegateHost = "localhost", - delegatePort = 10200), - @CreateAuthenticator(type = StrongAuthenticator.class) }) + name = "DelegatedAuthIT-MultipleAuthenticators-method") @ApplyLdifs( { // Entry # 1