Browse code
Fix network settings inspect tests
Makes sure the containers are actually running when inspecting so the
ip info is actually populated.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Brian Goff authored on 2015/11/04 02:12:19Showing 1 changed files
| ... | ... |
@@ -154,10 +154,11 @@ func (s *DockerSuite) TestInspectApiEmptyFieldsInConfigPre121(c *check.C) {
|
| 154 | 154 |
} |
| 155 | 155 |
|
| 156 | 156 |
func (s *DockerSuite) TestInspectApiBridgeNetworkSettings120(c *check.C) {
|
| 157 |
- out, _ := dockerCmd(c, "run", "-d", "busybox", "true") |
|
| 157 |
+ out, _ := dockerCmd(c, "run", "-d", "busybox", "top") |
|
| 158 |
+ containerID := strings.TrimSpace(out) |
|
| 159 |
+ waitRun(containerID) |
|
| 158 | 160 |
|
| 159 |
- cleanedContainerID := strings.TrimSpace(out) |
|
| 160 |
- body := getInspectBody(c, "v1.20", cleanedContainerID) |
|
| 161 |
+ body := getInspectBody(c, "v1.20", containerID) |
|
| 161 | 162 |
|
| 162 | 163 |
var inspectJSON v1p20.ContainerJSON |
| 163 | 164 |
err := json.Unmarshal(body, &inspectJSON) |
| ... | ... |
@@ -168,10 +169,11 @@ func (s *DockerSuite) TestInspectApiBridgeNetworkSettings120(c *check.C) {
|
| 168 | 168 |
} |
| 169 | 169 |
|
| 170 | 170 |
func (s *DockerSuite) TestInspectApiBridgeNetworkSettings121(c *check.C) {
|
| 171 |
- out, _ := dockerCmd(c, "run", "-d", "busybox", "true") |
|
| 172 |
- cleanedContainerID := strings.TrimSpace(out) |
|
| 171 |
+ out, _ := dockerCmd(c, "run", "-d", "busybox", "top") |
|
| 172 |
+ containerID := strings.TrimSpace(out) |
|
| 173 |
+ waitRun(containerID) |
|
| 173 | 174 |
|
| 174 |
- body := getInspectBody(c, "v1.21", cleanedContainerID) |
|
| 175 |
+ body := getInspectBody(c, "v1.21", containerID) |
|
| 175 | 176 |
|
| 176 | 177 |
var inspectJSON types.ContainerJSON |
| 177 | 178 |
err := json.Unmarshal(body, &inspectJSON) |