Author: reschke
Date: Fri Apr 7 12:29:28 2017
New Revision: 1790542
URL: http://svn.apache.org/viewvc?rev=1790542&view=rev
Log:
OAK-6057: incorrect system property check in blob tests
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FbsToS3Test.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3ToFbsTest.java
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FbsToS3Test.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FbsToS3Test.java?rev=1790542&r1=1790541&r2=1790542&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FbsToS3Test.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FbsToS3Test.java
Fri Apr 7 12:29:28 2017
@@ -39,7 +39,7 @@ public class FbsToS3Test extends Abstrac
private final NodeStoreContainer destination;
public FbsToS3Test() throws IOException {
- Assume.assumeTrue(S3_PROPERTIES != null);
+ Assume.assumeTrue(S3_PROPERTIES != null && !S3_PROPERTIES.isEmpty());
sourceBlob = new FileBlobStoreContainer();
destinationBlob = new S3DataStoreContainer(S3_PROPERTIES);
source = new SegmentTarNodeStoreContainer(sourceBlob);
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3ToFbsTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3ToFbsTest.java?rev=1790542&r1=1790541&r2=1790542&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3ToFbsTest.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3ToFbsTest.java
Fri Apr 7 12:29:28 2017
@@ -39,7 +39,7 @@ public class S3ToFbsTest extends Abstrac
private final NodeStoreContainer destination;
public S3ToFbsTest() throws IOException {
- Assume.assumeTrue(S3_PROPERTIES != null);
+ Assume.assumeTrue(S3_PROPERTIES != null && !S3_PROPERTIES.isEmpty());
sourceBlob = new S3DataStoreContainer(S3_PROPERTIES);
destinationBlob = new FileBlobStoreContainer();
source = new SegmentTarNodeStoreContainer(sourceBlob);