clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 21:51:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12961 from hqhq/hq_remove_err_out

Browse Source 
a few cleanups for client output
This commit is contained in:
Jessie Frazelle
2015-05-07 16:51:56 -07:00
parent 6a4c219615 5a6db4fd44
commit 372977148d
13 changed files with 58 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-cli/docker_cli_rm_test.go
+2 -2
View File
@@ -105,8 +105,8 @@ func (s *DockerSuite) TestRmContainerOrphaning(c *check.C) {
func (s *DockerSuite) TestRmInvalidContainer(c *check.C) {
if out, _, err := runCommandWithOutput(exec.Command(dockerBinary, "rm", "unknown")); err == nil {
c.Fatal("Expected error on rm unknown container, got none")
} else if !strings.Contains(out, "failed to remove one or more containers") {
c.Fatalf("Expected output to contain 'failed to remove one or more containers', got %q", out)
} else if !strings.Contains(out, "failed to remove containers") {
c.Fatalf("Expected output to contain 'failed to remove containers', got %q", out)
}
}