integrated dotcloud/docker_port-fix moby/moby@8ff271f

kpelykh · kpelykh · commit ed7985dac439 · 2013-07-19T12:17:07.000-07:00
diff --git a/src/main/java/com/kpelykh/docker/client/model/ContainerInspectResponse.java b/src/main/java/com/kpelykh/docker/client/model/ContainerInspectResponse.java
@@ -4,6 +4,7 @@
 import org.codehaus.jackson.annotate.JsonProperty;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -50,7 +51,7 @@ public class NetworkSettings {
         @JsonProperty("IPPrefixLen") public int ipPrefixLen;
         @JsonProperty("Gateway") public String gateway;
         @JsonProperty("Bridge") public String bridge;
-        @JsonProperty("PortMapping") public Map<String,String> portMapping;
+        @JsonProperty("PortMapping") public Map<String,Map<String, String>> portMapping;
     }
 
     public class ContainerState {
diff --git a/src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java b/src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java
@@ -57,8 +57,16 @@ public void beforeTest() throws DockerException {
 
     @AfterTest
     public void afterTest() {
-        LOG.info("======================= AFTERTEST =======================");
+        LOG.info("======================= END OF AFTERTEST =======================");
+    }
 
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        LOG.info(String.format("################################## STARTING %s ##################################", method.getName()));
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
         for (String image : tmpImgs) {
             LOG.info("Cleaning up temporary image " + image);
             try {
@@ -72,17 +80,7 @@ public void afterTest() {
                 dockerClient.removeContainer(container);
             } catch (DockerException ignore) {}
         }
-        LOG.info("======================= END OF AFTERTEST =======================");
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        LOG.info(String.format("################################## STARTING %s ##################################", method.getName()));
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        LOG.info(String.format("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ END OF %s ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n", result.getName()));
+        LOG.info(String.format("################################## END OF %s ##################################\n", result.getName()));
     }
 
     /*
@@ -456,9 +454,23 @@ public void testPullImage() throws DockerException, IOException {
 
         LOG.info("Pulling image " + testImage);
 
-        String response = dockerClient.pull(testImage);
+        ClientResponse response = dockerClient.pull(testImage);
+
+        StringWriter logwriter = new StringWriter();
+
+        try {
+            LineIterator itr = IOUtils.lineIterator(response.getEntityInputStream(), "UTF-8");
+            while (itr.hasNext()) {
+                String line = itr.next();
+                logwriter.write(line + "\n");
+                LOG.info(line);
+            }
+        } finally {
+            IOUtils.closeQuietly(response.getEntityInputStream());
+        }
 
-        assertThat(response, containsString("Pulling image e9aa60c60128cad1 () from joffrey/test001"));
+        String fullLog = logwriter.toString();
+        assertThat(fullLog, containsString("Pulling repository joffrey/test001"));
 
         tmpImgs.add(testImage);
 
@@ -649,7 +661,7 @@ public void testNetCatDockerfileBuilder() throws DockerException, IOException, I
 
         assertThat(containerInspectResponse.id, notNullValue());
         assertThat(containerInspectResponse.networkSettings.portMapping, notNullValue());
-        int port = Integer.valueOf(containerInspectResponse.networkSettings.portMapping.get("6900"));
+        int port = Integer.valueOf(containerInspectResponse.networkSettings.portMapping.get("Tcp").get("6900"));
 
 
         LOG.info("Checking port {} is open", port);
