Using checkers assert for integration-cli/docker_cli_attach_unix_test.go

Fixes part of #16756

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>

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.Assert(err, checker.IsNil, check.Commentf("Could not open pty: %v", err))
-		c.Fatalf("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.Assert(err, checker.IsNil, check.Commentf("Could not open pty: %v", err))
-		c.Fatalf("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 {
+	err = cmd.Start()
-		c.Fatal(err)
+	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 {
+	err = cmd.Wait()
-		c.Fatal(err)
+	c.Assert(err, checker.IsNil)
-	}
 
-	if !strings.Contains(string(bytes[:nBytes]), "/ #") {
+	c.Assert(string(bytes[:nBytes]), checker.Contains, "/ #")
-		c.Fatalf("failed to get a new prompt. got %s", string(bytes[:nBytes]))
-	}
 
 }
 
@@ -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.Assert(err, check.IsNil)
-		c.Fatal(err)
-	}
 	defer cpty.Close()
 
 	cmd := exec.Command(dockerBinary, "attach", id)
 	cmd.Stdin = tty
 	stdout, err := cmd.StdoutPipe()
-	if err != nil {
+	c.Assert(err, check.IsNil)
-		c.Fatal(err)
-	}
 	defer stdout.Close()
-	if err := cmd.Start(); err != nil {
+	err = cmd.Start()
-		c.Fatal(err)
+	c.Assert(err, check.IsNil)
-	}
 	c.Assert(waitRun(id), check.IsNil)
 
-	if _, err := cpty.Write([]byte("hello\n")); err != nil {
+	_, err = cpty.Write([]byte("hello\n"))
-		c.Fatal(err)
+	c.Assert(err, check.IsNil)
-	}
 	out, err = bufio.NewReader(stdout).ReadString('\n')
-	if err != nil {
+	c.Assert(err, check.IsNil)
-		c.Fatal(err)
+	c.Assert(strings.TrimSpace(out), checker.Equals, "hello", check.Commentf("expected 'hello', got %q", out))
-	}
-	if strings.TrimSpace(out) != "hello" {
-		c.Fatalf("expected 'hello', got %q", out)
-	}
 
 	// escape sequence
-	if _, err := cpty.Write([]byte{16}); err != nil {
+	_, err = cpty.Write([]byte{16})
-		c.Fatal(err)
+	c.Assert(err, checker.IsNil)
-	}
 	time.Sleep(100 * time.Millisecond)
-	if _, err := cpty.Write([]byte{17}); err != nil {
+	_, err = cpty.Write([]byte{17})
-		c.Fatal(err)
+	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.Assert(err, checker.IsNil)
-		c.Fatal(err)
+	c.Assert(running, checker.Equals, "true", check.Commentf("expected container to still be running"))
-	}
-	if running != "true" {
-		c.Fatal("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.Assert(err, checker.IsNil)
-		c.Fatal(err)
-	}
 	defer cpty.Close()
 
 	cmd := exec.Command(dockerBinary, "attach", id)
 	cmd.Stdin = tty
 	stdout, err := cmd.StdoutPipe()
-	if err != nil {
+	c.Assert(err, checker.IsNil)
-		c.Fatal(err)
-	}
 	defer stdout.Close()
-	if err := cmd.Start(); err != nil {
+	err = cmd.Start()
-		c.Fatal(err)
+	c.Assert(err, checker.IsNil)
-	}
 
-	if _, err := cpty.Write([]byte("hello\n")); err != nil {
+	_, err = cpty.Write([]byte("hello\n"))
-		c.Fatal(err)
+	c.Assert(err, checker.IsNil)
-	}
 	out, err = bufio.NewReader(stdout).ReadString('\n')
-	if err != nil {
+	c.Assert(err, checker.IsNil)
-		c.Fatal(err)
+	c.Assert(strings.TrimSpace(out), checker.Equals, "hello", check.Commentf("expected 'hello', got %q", out))
-	}
-	if strings.TrimSpace(out) != "hello" {
-		c.Fatalf("expected 'hello', got %q", out)
-	}
 
 	// escape sequence
-	if _, err := cpty.Write([]byte{16}); err != nil {
+	_, err = cpty.Write([]byte{16})
-		c.Fatal(err)
+	c.Assert(err, checker.IsNil)
-	}
 	time.Sleep(100 * time.Millisecond)
-	if _, err := cpty.Write([]byte{17}); err != nil {
+	_, err = cpty.Write([]byte{17})
-		c.Fatal(err)
+	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.Assert(err, checker.IsNil)
-		c.Fatal(err)
+	c.Assert(running, checker.Equals, "true", check.Commentf("expected container to still be running"))
-	}
-	if running != "true" {
-		c.Fatal("expected container to still be running")
-	}
 
 	go func() {
 		dockerCmd(c, "kill", id)