kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

use gocheck asserts instead of fatal

Browse source 
Signed-off-by: Hao Zhang <21521210@zju.edu.cn>
This commit is contained in:
Hao Zhang 2015-10-08 05:26:11 -04:00
parent a8175b751c
commit 22d0be5797
1 changed files with 20 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
integration-cli/docker_cli_rename_test.go
View file

@ -3,6 +3,7 @@ package main
import ( import (
"strings" "strings"
"github.com/docker/docker/pkg/integration/checker"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"github.com/go-check/check" "github.com/go-check/check"
) )
@ -19,12 +20,8 @@ func (s *DockerSuite) TestRenameStoppedContainer(c *check.C) {
dockerCmd(c, "rename", "first_name", newName) dockerCmd(c, "rename", "first_name", newName)
name, err = inspectField(cleanedContainerID, "Name") name, err = inspectField(cleanedContainerID, "Name")
if err != nil { c.Assert(err, checker.IsNil, check.Commentf("Failed to rename container %s", name))
c.Fatal(err) c.Assert(name, checker.Equals, "/"+newName, check.Commentf("Failed to rename container %s", name))
}
if name != "/"+newName {
c.Fatal("Failed to rename container ", name)
}
} }
@ -37,12 +34,8 @@ func (s *DockerSuite) TestRenameRunningContainer(c *check.C) {
dockerCmd(c, "rename", "first_name", newName) dockerCmd(c, "rename", "first_name", newName)
name, err := inspectField(cleanedContainerID, "Name") name, err := inspectField(cleanedContainerID, "Name")
if err != nil { c.Assert(err, checker.IsNil, check.Commentf("Failed to rename container %s", name))
c.Fatal(err) c.Assert(name, checker.Equals, "/"+newName, check.Commentf("Failed to rename container %s", name))
}
if name != "/"+newName {
c.Fatal("Failed to rename container ")
}
} }
func (s *DockerSuite) TestRenameCheckNames(c *check.C) { func (s *DockerSuite) TestRenameCheckNames(c *check.C) {
@ -53,36 +46,30 @@ func (s *DockerSuite) TestRenameCheckNames(c *check.C) {
dockerCmd(c, "rename", "first_name", newName) dockerCmd(c, "rename", "first_name", newName)
name, err := inspectField(newName, "Name") name, err := inspectField(newName, "Name")
if err != nil { c.Assert(err, checker.IsNil, check.Commentf("Failed to rename container %s", name))
c.Fatal(err) c.Assert(name, checker.Equals, "/"+newName, check.Commentf("Failed to rename container %s", name))
}
if name != "/"+newName {
c.Fatal("Failed to rename container ")
}
name, err = inspectField("first_name", "Name") name, err = inspectField("first_name", "Name")
if err == nil && !strings.Contains(err.Error(), "No such image or container: first_name") { c.Assert(err, checker.NotNil, check.Commentf(name))
c.Fatal(err) c.Assert(err.Error(), checker.Contains, "No such image or container: first_name")
}
} }
func (s *DockerSuite) TestRenameInvalidName(c *check.C) { func (s *DockerSuite) TestRenameInvalidName(c *check.C) {
testRequires(c, DaemonIsLinux) testRequires(c, DaemonIsLinux)
dockerCmd(c, "run", "--name", "myname", "-d", "busybox", "top") dockerCmd(c, "run", "--name", "myname", "-d", "busybox", "top")
if out, _, err := dockerCmdWithError("rename", "myname", "new:invalid"); err == nil || !strings.Contains(out, "Invalid container name") { out, _, err := dockerCmdWithError("rename", "myname", "new:invalid")
c.Fatalf("Renaming container to invalid name should have failed: %s\n%v", out, err) c.Assert(err, checker.NotNil, check.Commentf("Renaming container to invalid name should have failed: %s", out))
} c.Assert(out, checker.Contains, "Invalid container name", check.Commentf("%v", err))
if out, _, err := dockerCmdWithError("rename", "myname", ""); err == nil || !strings.Contains(out, "may be empty") { out, _, err = dockerCmdWithError("rename", "myname", "")
c.Fatalf("Renaming container to empty name should have failed: %s\n%v", out, err) c.Assert(err, checker.NotNil, check.Commentf("Renaming container to invalid name should have failed: %s", out))
} c.Assert(out, checker.Contains, "may be empty", check.Commentf("%v", err))
if out, _, err := dockerCmdWithError("rename", "", "newname"); err == nil || !strings.Contains(out, "may be empty") { out, _, err = dockerCmdWithError("rename", "", "newname")
c.Fatalf("Renaming container to empty name should have failed: %s\n%v", out, err) c.Assert(err, checker.NotNil, check.Commentf("Renaming container with empty name should have failed: %s", out))
} c.Assert(out, checker.Contains, "may be empty", check.Commentf("%v", err))
if out, _, err := dockerCmdWithError("ps", "-a"); err != nil || !strings.Contains(out, "myname") { out, _ = dockerCmd(c, "ps", "-a")
c.Fatalf("Output of docker ps should have included 'myname': %s\n%v", out, err) c.Assert(out, checker.Contains, "myname", check.Commentf("Output of docker ps should have included 'myname': %s", out))
}
} }