You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2011/07/26 20:44:17 UTC
svn commit: r1151207 -
/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java
Author: elecharny
Date: Tue Jul 26 18:44:16 2011
New Revision: 1151207
URL: http://svn.apache.org/viewvc?rev=1151207&view=rev
Log:
The consumer is not erased in the testReboot test, we restart the existing one
Modified:
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java?rev=1151207&r1=1151206&r2=1151207&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java Tue Jul 26 18:44:16 2011
@@ -34,6 +34,7 @@ import org.apache.directory.server.annot
import org.apache.directory.server.annotations.CreateTransport;
import org.apache.directory.server.core.CoreSession;
import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.annotations.ContextEntry;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.annotations.CreateIndex;
import org.apache.directory.server.core.annotations.CreatePartition;
@@ -83,7 +84,6 @@ public class ClientServerReplicationIT
startProvider();
startConsumer();
- injectContextEntry();
}
@@ -95,36 +95,6 @@ public class ClientServerReplicationIT
}
- private static void injectContextEntry() throws Exception
- {
- String dn = "dc=example,dc=com";
-
- DefaultEntry entry = new DefaultEntry( schemaManager, dn,
- "objectClass", "domain",
- "dc", "example" );
-
- assertFalse( consumerSession.exists( dn ) );
-
- providerSession.add( entry );
-
- assertTrue( providerSession.exists( dn ) );
- boolean replicated = false;
-
- for ( int i = 0; i < 50; i++ )
- {
- Thread.sleep( 100 );
-
- if ( consumerSession.exists( dn ) )
- {
- replicated = true;
- break;
- }
- }
-
- assertTrue( replicated );
- }
-
-
/**
* Check that the entry exists in the target server. We wait up to 10 seconds, by
* 100ms steps, until either the entry s found, or we have exhausted the 10 seconds delay.
@@ -158,7 +128,7 @@ public class ClientServerReplicationIT
boolean exists = session.exists( entryDn );
boolean deleted = false;
- for ( int i = 0; i < 50; i++ )
+ for ( int i = 0; i < 100; i++ )
{
Thread.sleep( 100 );
@@ -270,41 +240,54 @@ public class ClientServerReplicationIT
@Test
- @Ignore( "Still fails randomly" )
+ @Ignore( "test is failing" )
public void testRebootConsumer() throws Exception
{
+ System.out.println( "----> 1 testRebootConsumer started --------------------------------" );
Entry provUser = createEntry();
assertFalse( providerSession.exists(provUser.getDn() ) );
assertFalse( consumerSession.exists(provUser.getDn() ) );
+ System.out.println( "----> 2 Adding entry " + provUser.getDn() +" in provider --------------------------------" );
providerSession.add( provUser );
assertTrue( checkEntryExistence( consumerSession, provUser.getDn() ) );
waitAndCompareEntries( provUser.getDn() );
+ System.out.println( "----> 3 entry " + provUser.getDn() +" present in consumer --------------------------------" );
+
assertTrue( providerSession.exists(provUser.getDn() ) );
assertTrue( consumerSession.exists(provUser.getDn() ) );
// Now stop the consumer
+ System.out.println( "----> 4 Stopping the consumer --------------------------------" );
consumerServer.stop();
// And delete the entry in the provider
Dn deletedUserDn = provUser.getDn();
+ System.out.println( "----> 5 deleting entry " + deletedUserDn + " from provider --------------------------------" );
providerSession.delete( deletedUserDn );
// Create a new entry
provUser = createEntry();
Dn addedUserDn = provUser.getDn();
+ System.out.println( "----> 6 adding entry " + provUser.getDn() + " into provider --------------------------------" );
providerSession.add( provUser );
// Restart the consumer
- startConsumer();
+ System.out.println( "----> 7 Restarting the consumer --------------------------------" );
+ consumerServer.start();
+
+ assertTrue( consumerSession.exists( deletedUserDn ) );
+ System.out.println( "----> 7bis entry " + deletedUserDn + " is still present in consumer --------------------------------" );
- assertFalse( consumerSession.exists( deletedUserDn ) );
+ assertTrue( checkEntryDeletion( consumerSession, deletedUserDn ) );
+ System.out.println( "----> 8 Entry " + deletedUserDn + " deleted from consumer --------------------------------" );
assertTrue( checkEntryExistence( consumerSession, addedUserDn ) );
waitAndCompareEntries( addedUserDn );
+ System.out.println( "----> 8 Entry " + addedUserDn + " added into consumer --------------------------------" );
}
@@ -343,7 +326,11 @@ public class ClientServerReplicationIT
@CreateIndex(attribute = "objectClass"),
@CreateIndex(attribute = "dc"),
@CreateIndex(attribute = "ou")
- })
+ },
+ contextEntry=@ContextEntry( entryLdif =
+ "dn: dc=example,dc=com\n" +
+ "objectClass: domain\n" +
+ "dc: example" ) )
})
@CreateLdapServer(transports =
{ @CreateTransport( port=16000, protocol = "LDAP") })
@@ -394,7 +381,11 @@ public class ClientServerReplicationIT
@CreateIndex(attribute = "objectClass"),
@CreateIndex(attribute = "dc"),
@CreateIndex(attribute = "ou")
- })
+ },
+ contextEntry=@ContextEntry( entryLdif =
+ "dn: dc=example,dc=com\n" +
+ "objectClass: domain\n" +
+ "dc: example" ) )
})
@CreateLdapServer(transports =
{ @CreateTransport( port=17000, protocol = "LDAP") })