Allow overriding test configuration at run-time

References #700.
gaul · Oct 27, 2024 · 00142f3 · 00142f3
1 parent 111a681
commit 00142f3
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/src/test/java/org/gaul/s3proxy/AwsSdkTest.java b/src/test/java/org/gaul/s3proxy/AwsSdkTest.java
@@ -128,7 +128,7 @@ public final class AwsSdkTest {
     @Before
     public void setUp() throws Exception {
         TestUtils.S3ProxyLaunchInfo info = TestUtils.startS3Proxy(
-                "s3proxy.conf");
+                System.getProperty("s3proxy.test.conf", "s3proxy.conf"));
         awsCreds = new BasicAWSCredentials(info.getS3Identity(),
                 info.getS3Credential());
         context = info.getBlobStore().getContext();

diff --git a/src/test/java/org/gaul/s3proxy/JcloudsBucketsLiveTest.java b/src/test/java/org/gaul/s3proxy/JcloudsBucketsLiveTest.java
@@ -63,7 +63,8 @@ protected void awaitConsistency() {
     protected Properties setupProperties() {
         TestUtils.S3ProxyLaunchInfo info;
         try {
-            info = TestUtils.startS3Proxy("s3proxy.conf");
+            info = TestUtils.startS3Proxy(
+                    System.getProperty("s3proxy.test.conf", "s3proxy.conf"));
             s3Proxy = info.getS3Proxy();
             context = info.getBlobStore().getContext();
             blobStoreType = context.unwrap().getProviderMetadata().getId();

diff --git a/src/test/java/org/gaul/s3proxy/JcloudsS3BlobIntegrationLiveTest.java b/src/test/java/org/gaul/s3proxy/JcloudsS3BlobIntegrationLiveTest.java
@@ -59,7 +59,8 @@ protected void awaitConsistency() {
     protected Properties setupProperties() {
         TestUtils.S3ProxyLaunchInfo info;
         try {
-            info = TestUtils.startS3Proxy("s3proxy.conf");
+            info = TestUtils.startS3Proxy(
+                    System.getProperty("s3proxy.test.conf", "s3proxy.conf"));
             s3Proxy = info.getS3Proxy();
             context = info.getBlobStore().getContext();
             blobStoreType = context.unwrap().getProviderMetadata().getId();

diff --git a/src/test/java/org/gaul/s3proxy/JcloudsS3BlobSignerLiveTest.java b/src/test/java/org/gaul/s3proxy/JcloudsS3BlobSignerLiveTest.java
@@ -55,7 +55,8 @@ protected void awaitConsistency() {
     protected Properties setupProperties() {
         TestUtils.S3ProxyLaunchInfo info;
         try {
-            info = TestUtils.startS3Proxy("s3proxy.conf");
+            info = TestUtils.startS3Proxy(
+                    System.getProperty("s3proxy.test.conf", "s3proxy.conf"));
             s3Proxy = info.getS3Proxy();
             context = info.getBlobStore().getContext();
         } catch (Exception e) {

diff --git a/src/test/java/org/gaul/s3proxy/JcloudsS3ClientLiveTest.java b/src/test/java/org/gaul/s3proxy/JcloudsS3ClientLiveTest.java
@@ -67,7 +67,8 @@ protected void awaitConsistency() {
     protected Properties setupProperties() {
         TestUtils.S3ProxyLaunchInfo info;
         try {
-            info = TestUtils.startS3Proxy("s3proxy.conf");
+            info = TestUtils.startS3Proxy(
+                    System.getProperty("s3proxy.test.conf", "s3proxy.conf"));
             s3Proxy = info.getS3Proxy();
             context = info.getBlobStore().getContext();
             blobStoreType = context.unwrap().getProviderMetadata().getId();

diff --git a/src/test/java/org/gaul/s3proxy/JcloudsS3ContainerIntegrationLiveTest.java b/src/test/java/org/gaul/s3proxy/JcloudsS3ContainerIntegrationLiveTest.java
@@ -58,7 +58,8 @@ protected void awaitConsistency() {
     protected Properties setupProperties() {
         TestUtils.S3ProxyLaunchInfo info;
         try {
-            info = TestUtils.startS3Proxy("s3proxy.conf");
+            info = TestUtils.startS3Proxy(
+                    System.getProperty("s3proxy.test.conf", "s3proxy.conf"));
             s3Proxy = info.getS3Proxy();
             context = info.getBlobStore().getContext();
             blobStoreType = context.unwrap().getProviderMetadata().getId();