You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2016/01/13 11:38:01 UTC

svn commit: r1724393 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/migration/DocumentToExternalMigrationTest.java

Author: mreutegg
Date: Wed Jan 13 10:38:01 2016
New Revision: 1724393

URL: http://svn.apache.org/viewvc?rev=1724393&view=rev
Log:
OAK-3874: DocumentToExternalMigrationTest fails occasionally

Modified:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/migration/DocumentToExternalMigrationTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/migration/DocumentToExternalMigrationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/migration/DocumentToExternalMigrationTest.java?rev=1724393&r1=1724392&r2=1724393&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/migration/DocumentToExternalMigrationTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/migration/DocumentToExternalMigrationTest.java Wed Jan 13 10:38:01 2016
@@ -22,6 +22,7 @@ package org.apache.jackrabbit.oak.plugin
 import java.io.File;
 import java.io.IOException;
 
+import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
 import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
 import org.apache.jackrabbit.oak.plugins.document.MongoConnectionFactory;
@@ -43,6 +44,23 @@ public class DocumentToExternalMigration
     private DocumentNodeStore nodeStore;
 
     @Override
+    public void setup() throws CommitFailedException, IllegalArgumentException,
+            IOException {
+        dropDB();
+        super.setup();
+    }
+
+    @Override
+    public void teardown() throws IOException {
+        super.teardown();
+        dropDB();
+    }
+
+    private void dropDB() {
+        connectionFactory.getConnection().getDB().dropDatabase();
+    }
+
+    @Override
     protected NodeStore createNodeStore(BlobStore blobStore, File repository) throws IOException {
         MongoConnection connection = connectionFactory.getConnection();
         Assume.assumeNotNull(connection);