svn commit: r1847021 - /jackrabbit/oak/trunk/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzuriteDockerRule.java

[mr...@apache.org]

Author: mreutegg
Date: Tue Nov 20 15:44:53 2018
New Revision: 1847021

URL: http://svn.apache.org/viewvc?rev=1847021&view=rev
Log:
OAK-7889: Test failure: Unable to start Docker container

Pull image with empty auth supplier

Modified:
    jackrabbit/oak/trunk/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzuriteDockerRule.java

Modified: jackrabbit/oak/trunk/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzuriteDockerRule.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzuriteDockerRule.java?rev=1847021&r1=1847020&r2=1847021&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzuriteDockerRule.java (original)
+++ jackrabbit/oak/trunk/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzuriteDockerRule.java Tue Nov 20 15:44:53 2018
@@ -22,6 +22,8 @@ import com.microsoft.azure.storage.Cloud
 import com.microsoft.azure.storage.StorageException;
 import com.microsoft.azure.storage.blob.CloudBlobContainer;
 import com.spotify.docker.client.DefaultDockerClient;
+import com.spotify.docker.client.auth.FixedRegistryAuthSupplier;
+
 import org.junit.Assume;
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
@@ -32,11 +34,13 @@ import java.security.InvalidKeyException
 
 public class AzuriteDockerRule implements TestRule {
 
+    private static final String IMAGE = "trekawek/azurite";
+
     private final DockerRule wrappedRule;
 
     public AzuriteDockerRule() {
         wrappedRule = new DockerRule(ImmutableDockerConfig.builder()
-                .image("trekawek/azurite")
+                .image(IMAGE)
                 .name("oak-test-azurite")
                 .ports("10000")
                 .addStartedListener(container -> {
@@ -61,11 +65,16 @@ public class AzuriteDockerRule implement
     @Override
     public Statement apply(Statement statement, Description description) {
         try {
-            DefaultDockerClient client = DefaultDockerClient.fromEnv().connectTimeoutMillis(5000L).readTimeoutMillis(20000L).build();
+            DefaultDockerClient client = DefaultDockerClient.fromEnv()
+                    .connectTimeoutMillis(5000L)
+                    .readTimeoutMillis(20000L)
+                    .registryAuthSupplier(new FixedRegistryAuthSupplier())
+                    .build();
             client.ping();
+            client.pull(IMAGE);
             client.close();
-        } catch (Exception e) {
-            Assume.assumeNoException(e);
+        } catch (Throwable t) {
+            Assume.assumeNoException(t);
         }
 
         return wrappedRule.apply(statement, description);