centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-27 14:28:47 +07:00
Code Issues Packages Projects Releases Wiki Activity

Use inspectField to simplify code

Browse Source 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
This commit is contained in:
Qiang Huang
2015-05-18 10:06:13 +08:00
parent 9c5635a2a0
commit 74f8a4eca4
9 changed files with 84 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
integration-cli/docker_cli_commit_test.go
View File

@@ -85,16 +85,11 @@ func (s *DockerSuite) TestCommitPausedContainer(c *check.C) {
c.Fatalf("failed to commit container to image: %s, %v", out, err)
}
cmd = exec.Command(dockerBinary, "inspect", "-f", "{{.State.Paused}}", cleanedContainerID)
out, _, _, err = runCommandWithStdoutStderr(cmd)
if err != nil {
c.Fatalf("failed to inspect container: %v, output: %q", err, out)
}
out, err = inspectField(cleanedContainerID, "State.Paused")
c.Assert(err, check.IsNil)
if !strings.Contains(out, "true") {
c.Fatalf("commit should not unpause a paused container")
}
}
func (s *DockerSuite) TestCommitNewFile(c *check.C) {
@@ -242,9 +237,7 @@ func (s *DockerSuite) TestCommitChange(c *check.C) {
for conf, value := range expected {
res, err := inspectField(imageId, conf)
if err != nil {
c.Errorf("failed to get value %s, error: %s", conf, err)
}
c.Assert(err, check.IsNil)
if res != value {
c.Errorf("%s('%s'), expected %s", conf, res, value)
}