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 am...@apache.org on 2018/09/12 08:30:10 UTC

svn commit: r1840635 - in /jackrabbit/oak/trunk: oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java

Author: amitj
Date: Wed Sep 12 08:30:10 2018
New Revision: 1840635

URL: http://svn.apache.org/viewvc?rev=1840635&view=rev
Log:
OAK-7749: Fix random failures in S3 related tests

- Initializing random buckets
- Checking if object null when closing

Modified:
    jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java
    jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java

Modified: jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java?rev=1840635&r1=1840634&r2=1840635&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java Wed Sep 12 08:30:10 2018
@@ -108,6 +108,8 @@ public class DataStoreCheckTest {
             Properties props = S3DataStoreUtils.getS3Config();
             props.setProperty("cacheSize", "0");
             container = props.getProperty(S3Constants.S3_BUCKET);
+            container = container + "-" + String.valueOf(System.currentTimeMillis());
+            props.setProperty(S3Constants.S3_BUCKET, container);
             DataStore ds = S3DataStoreUtils.getS3DataStore(S3DataStoreUtils.getFixtures().get(0),
                 props,
                 temporaryFolder.newFolder().getAbsolutePath());

Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java?rev=1840635&r1=1840634&r2=1840635&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java Wed Sep 12 08:30:10 2018
@@ -227,8 +227,12 @@ public class SharedBlobStoreGCTest {
     @After
     public void tearDown() throws Exception {
         DataStoreUtils.time = -1;
-        cluster1.getDocumentNodeStore().dispose();
-        cluster2.getDocumentNodeStore().dispose();
+        if (cluster1 != null) {
+            cluster1.getDocumentNodeStore().dispose();
+        }
+        if (cluster2 != null) {
+            cluster2.getDocumentNodeStore().dispose();
+        }
     }
 
     protected DataStoreBlobStore getBlobStore(File root) throws Exception {