From f4abc6406e5837cee33763b6784b89578045d4db Mon Sep 17 00:00:00 2001 From: Wen Cheng Ma Date: Wed, 28 Oct 2015 11:18:01 +0800 Subject: [PATCH] Using checkers assert for integration-cli/docker_cli_attach_unix_test.go Fixes part of #16756 Signed-off-by: Wen Cheng Ma --- .../docker_cli_attach_unix_test.go | 111 ++++++------------ 1 file changed, 36 insertions(+), 75 deletions(-) diff --git a/integration-cli/docker_cli_attach_unix_test.go b/integration-cli/docker_cli_attach_unix_test.go index 64ac28bd72..ea145105aa 100644 --- a/integration-cli/docker_cli_attach_unix_test.go +++ b/integration-cli/docker_cli_attach_unix_test.go @@ -8,6 +8,7 @@ import ( "strings" "time" + "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/stringid" "github.com/go-check/check" "github.com/kr/pty" @@ -58,9 +59,7 @@ func (s *DockerSuite) TestAttachAfterDetach(c *check.C) { name := "detachtest" cpty, tty, err := pty.Open() - if err != nil { - c.Fatalf("Could not open pty: %v", err) - } + c.Assert(err, checker.IsNil, check.Commentf("Could not open pty: %v", err)) cmd := exec.Command(dockerBinary, "run", "-ti", "--name", name, "busybox") cmd.Stdin = tty cmd.Stdout = tty @@ -86,18 +85,15 @@ func (s *DockerSuite) TestAttachAfterDetach(c *check.C) { } cpty, tty, err = pty.Open() - if err != nil { - c.Fatalf("Could not open pty: %v", err) - } + c.Assert(err, checker.IsNil, check.Commentf("Could not open pty: %v", err)) cmd = exec.Command(dockerBinary, "attach", name) cmd.Stdin = tty cmd.Stdout = tty cmd.Stderr = tty - if err := cmd.Start(); err != nil { - c.Fatal(err) - } + err = cmd.Start() + c.Assert(err, checker.IsNil) bytes := make([]byte, 10) var nBytes int @@ -120,13 +116,10 @@ func (s *DockerSuite) TestAttachAfterDetach(c *check.C) { c.Fatal("timeout waiting for attach read") } - if err := cmd.Wait(); err != nil { - c.Fatal(err) - } + err = cmd.Wait() + c.Assert(err, checker.IsNil) - if !strings.Contains(string(bytes[:nBytes]), "/ #") { - c.Fatalf("failed to get a new prompt. got %s", string(bytes[:nBytes])) - } + c.Assert(string(bytes[:nBytes]), checker.Contains, "/ #") } @@ -137,42 +130,30 @@ func (s *DockerSuite) TestAttachDetach(c *check.C) { c.Assert(waitRun(id), check.IsNil) cpty, tty, err := pty.Open() - if err != nil { - c.Fatal(err) - } + c.Assert(err, check.IsNil) defer cpty.Close() cmd := exec.Command(dockerBinary, "attach", id) cmd.Stdin = tty stdout, err := cmd.StdoutPipe() - if err != nil { - c.Fatal(err) - } + c.Assert(err, check.IsNil) defer stdout.Close() - if err := cmd.Start(); err != nil { - c.Fatal(err) - } + err = cmd.Start() + c.Assert(err, check.IsNil) c.Assert(waitRun(id), check.IsNil) - if _, err := cpty.Write([]byte("hello\n")); err != nil { - c.Fatal(err) - } + _, err = cpty.Write([]byte("hello\n")) + c.Assert(err, check.IsNil) out, err = bufio.NewReader(stdout).ReadString('\n') - if err != nil { - c.Fatal(err) - } - if strings.TrimSpace(out) != "hello" { - c.Fatalf("expected 'hello', got %q", out) - } + c.Assert(err, check.IsNil) + c.Assert(strings.TrimSpace(out), checker.Equals, "hello", check.Commentf("expected 'hello', got %q", out)) // escape sequence - if _, err := cpty.Write([]byte{16}); err != nil { - c.Fatal(err) - } + _, err = cpty.Write([]byte{16}) + c.Assert(err, checker.IsNil) time.Sleep(100 * time.Millisecond) - if _, err := cpty.Write([]byte{17}); err != nil { - c.Fatal(err) - } + _, err = cpty.Write([]byte{17}) + c.Assert(err, checker.IsNil) ch := make(chan struct{}) go func() { @@ -181,12 +162,8 @@ func (s *DockerSuite) TestAttachDetach(c *check.C) { }() running, err := inspectField(id, "State.Running") - if err != nil { - c.Fatal(err) - } - if running != "true" { - c.Fatal("expected container to still be running") - } + c.Assert(err, checker.IsNil) + c.Assert(running, checker.Equals, "true", check.Commentf("expected container to still be running")) go func() { dockerCmd(c, "kill", id) @@ -207,41 +184,29 @@ func (s *DockerSuite) TestAttachDetachTruncatedID(c *check.C) { c.Assert(waitRun(id), check.IsNil) cpty, tty, err := pty.Open() - if err != nil { - c.Fatal(err) - } + c.Assert(err, checker.IsNil) defer cpty.Close() cmd := exec.Command(dockerBinary, "attach", id) cmd.Stdin = tty stdout, err := cmd.StdoutPipe() - if err != nil { - c.Fatal(err) - } + c.Assert(err, checker.IsNil) defer stdout.Close() - if err := cmd.Start(); err != nil { - c.Fatal(err) - } + err = cmd.Start() + c.Assert(err, checker.IsNil) - if _, err := cpty.Write([]byte("hello\n")); err != nil { - c.Fatal(err) - } + _, err = cpty.Write([]byte("hello\n")) + c.Assert(err, checker.IsNil) out, err = bufio.NewReader(stdout).ReadString('\n') - if err != nil { - c.Fatal(err) - } - if strings.TrimSpace(out) != "hello" { - c.Fatalf("expected 'hello', got %q", out) - } + c.Assert(err, checker.IsNil) + c.Assert(strings.TrimSpace(out), checker.Equals, "hello", check.Commentf("expected 'hello', got %q", out)) // escape sequence - if _, err := cpty.Write([]byte{16}); err != nil { - c.Fatal(err) - } + _, err = cpty.Write([]byte{16}) + c.Assert(err, checker.IsNil) time.Sleep(100 * time.Millisecond) - if _, err := cpty.Write([]byte{17}); err != nil { - c.Fatal(err) - } + _, err = cpty.Write([]byte{17}) + c.Assert(err, checker.IsNil) ch := make(chan struct{}) go func() { @@ -250,12 +215,8 @@ func (s *DockerSuite) TestAttachDetachTruncatedID(c *check.C) { }() running, err := inspectField(id, "State.Running") - if err != nil { - c.Fatal(err) - } - if running != "true" { - c.Fatal("expected container to still be running") - } + c.Assert(err, checker.IsNil) + c.Assert(running, checker.Equals, "true", check.Commentf("expected container to still be running")) go func() { dockerCmd(c, "kill", id)