svn commit: r1762854 - in /jackrabbit/oak/trunk: oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/S3SharedBlobStoreGCTest.java

[amitj]

Author: amitj
Date: Fri Sep 30 05:49:46 2016
New Revision: 1762854

URL: http://svn.apache.org/viewvc?rev=1762854&view=rev
Log:
OAK-4848: Improve oak-blob-cloud tests

Fix s3 bucket cleanup

Modified:
    
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java
    
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/S3SharedBlobStoreGCTest.java

Modified: 
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java?rev=1762854&r1=1762853&r2=1762854&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java
 Fri Sep 30 05:49:46 2016
@@ -77,7 +77,7 @@ public class TestS3Ds extends AbstractDa
     public void setUp() throws Exception {
         props = getS3Config();
         startTime = new Date();
-        String bucket =
+        bucket =
             String.valueOf(randomGen.nextInt(9999)) + "-" + 
String.valueOf(randomGen.nextInt(9999))
                 + "-test";
         props.setProperty(S3Constants.S3_BUCKET, bucket);

Modified: 
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/S3SharedBlobStoreGCTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/S3SharedBlobStoreGCTest.java?rev=1762854&r1=1762853&r2=1762854&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/S3SharedBlobStoreGCTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/S3SharedBlobStoreGCTest.java
 Fri Sep 30 05:49:46 2016
@@ -70,7 +70,7 @@ public class S3SharedBlobStoreGCTest ext
 
     @Override
     protected void sleep() throws InterruptedException {
-        if (S3DataStoreUtils.isS3DataStore()) {
+        if (S3DataStoreUtils.isS3Configured()) {
             Thread.sleep(1000);
         }
     }