directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r1397690 - in /directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication: ClientInitialRefreshIT.java ClientServerReplicationIT.java
Date Fri, 12 Oct 2012 19:02:23 GMT
Author: seelmann
Date: Fri Oct 12 19:02:22 2012
New Revision: 1397690

URL: http://svn.apache.org/viewvc?rev=1397690&view=rev
Log:
* Shutdown directory service instances to unlock the DS lock file which causes test failure
on Windows
* Enable two tests that seem to work, to be verified on CI

Modified:
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java
    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/ClientInitialRefreshIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java?rev=1397690&r1=1397689&r2=1397690&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java
Fri Oct 12 19:02:22 2012
@@ -91,9 +91,10 @@ public class ClientInitialRefreshIT
 
 
     @AfterClass
-    public static void tearDown()
+    public static void tearDown() throws Exception
     {
         providerServer.stop();
+        providerServer.getDirectoryService().shutdown();
     }
 
 
@@ -384,7 +385,7 @@ public class ClientInitialRefreshIT
         // We should have 1000 entries plus the base entry = 1001
         assertTrue( waitForSyncReplClient( consumer, 1001 ) );
 
-        // Inject a new intry in the producer
+        // Inject a new entry in the producer
         Entry addedEntry = createEntry();
         providerSession.add( addedEntry );
 

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=1397690&r1=1397689&r2=1397690&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
Fri Oct 12 19:02:22 2012
@@ -98,10 +98,12 @@ public class ClientServerReplicationIT
 
 
     @AfterClass
-    public static void tearDown()
+    public static void tearDown() throws Exception
     {
         consumerServer.stop();
+        consumerServer.getDirectoryService().shutdown();
         providerServer.stop();
+        providerServer.getDirectoryService().shutdown();
     }
 
 
@@ -229,7 +231,6 @@ public class ClientServerReplicationIT
 
 
     @Test
-    @Ignore("This test is curently failing")
     public void testModify() throws Exception
     {
         Entry provUser = createEntry();
@@ -252,7 +253,6 @@ public class ClientServerReplicationIT
 
 
     @Test
-    @Ignore("This test is curently failing")
     public void testModDn() throws Exception
     {
         Entry provUser = createEntry();



Mime
View raw message