From 79498b1c6124ab4faabb408ef7d973ac899ad1e1 Mon Sep 17 00:00:00 2001 From: Xiaoxu Chen Date: Thu, 8 Oct 2015 12:43:03 -0400 Subject: [PATCH 1/2] refactor integration-cli/docker_cli_login_test.go with Assert part of #16756 Signed-off-by: Xiaoxu Chen --- integration-cli/docker_cli_login_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-cli/docker_cli_login_test.go b/integration-cli/docker_cli_login_test.go index 3b4431d2d..717a1bed7 100644 --- a/integration-cli/docker_cli_login_test.go +++ b/integration-cli/docker_cli_login_test.go @@ -4,6 +4,7 @@ import ( "bytes" "os/exec" + "github.com/docker/docker/pkg/integration/checker" "github.com/go-check/check" ) @@ -14,8 +15,7 @@ func (s *DockerSuite) TestLoginWithoutTTY(c *check.C) { cmd.Stdin = bytes.NewBufferString("buffer test string \n") // run the command and block until it's done - if err := cmd.Run(); err == nil { - c.Fatal("Expected non nil err when loginning in & TTY not available") - } + err := cmd.Run() + c.Assert(err, checker.NotNil, check.Commentf("Expected non nil err when loginning in & TTY not available")) } From 75bc0c064bb9a0b06b257add956a461c89f24b9b Mon Sep 17 00:00:00 2001 From: Xiaoxu Chen Date: Fri, 9 Oct 2015 15:08:01 +0800 Subject: [PATCH 2/2] update docker_cli_login_test.go part of #16756 Signed-off-by: Xiaoxu Chen --- integration-cli/docker_cli_login_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-cli/docker_cli_login_test.go b/integration-cli/docker_cli_login_test.go index 717a1bed7..13d43404a 100644 --- a/integration-cli/docker_cli_login_test.go +++ b/integration-cli/docker_cli_login_test.go @@ -16,6 +16,6 @@ func (s *DockerSuite) TestLoginWithoutTTY(c *check.C) { // run the command and block until it's done err := cmd.Run() - c.Assert(err, checker.NotNil, check.Commentf("Expected non nil err when loginning in & TTY not available")) + c.Assert(err, checker.NotNil) //"Expected non nil err when loginning in & TTY not available" }