fix client config test to handle different develeoper environments

gesellix · gesellix · commit 0319b14b2eab · 2015-01-18T12:30:15.000+01:00
diff --git a/.dockerignore b/.dockerignore
@@ -1 +1,2 @@
-target
+.git/
+target/
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
@@ -84,7 +84,9 @@ public void environmentDockerHostWithInvalidTlsVerify() throws Exception {
         // given docker host in env
         Map<String, String> env = new HashMap<String, String>(System.getenv());
         env.put("DOCKER_HOST", "tcp://bar:8768");
-        // and it looks to be SSL enabled
+        // and it looks to be SSL disabled
+        env.remove("DOCKER_CERT_PATH");
+        // and it has an invalid TLS_VERIFY value
         env.put("DOCKER_TLS_VERIFY", "any value different from '1'");
 
         // when you build a config
@@ -94,6 +96,24 @@ public void environmentDockerHostWithInvalidTlsVerify() throws Exception {
         assertEquals(config.getUri(), URI.create("http://bar:8768"));
     }
 
+    @Test
+    public void environmentDockerHostWithInvalidTlsVerifyButWithCertPath() throws Exception {
+
+        // given docker host in env
+        Map<String, String> env = new HashMap<String, String>(System.getenv());
+        env.put("DOCKER_HOST", "tcp://bar:8768");
+        // and it looks to be SSL enabled
+        env.put("DOCKER_CERT_PATH", "any value");
+        // and it has an invalid TLS_VERIFY value
+        env.put("DOCKER_TLS_VERIFY", "any value different from '1'");
+
+        // when you build a config
+        DockerClientConfig config = buildConfig(env, new Properties());
+
+        // then the URL is that value with "tcp" changed to "https"
+        assertEquals(config.getUri(), URI.create("https://bar:8768"));
+    }
+
     @Test
     public void environment() throws Exception {
 
