Przeglądaj źródła

Use of checkers on docker_cli_pause_test.go.

Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
liaoqingwei 9 lat temu
rodzic
commit
851a533a82
1 zmienionych plików z 11 dodań i 30 usunięć
  1. 11 30
      integration-cli/docker_cli_pause_test.go

+ 11 - 30
integration-cli/docker_cli_pause_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"fmt"
 	"strings"
 	"strings"
 
 
+	"github.com/docker/docker/pkg/integration/checker"
 	"github.com/go-check/check"
 	"github.com/go-check/check"
 )
 )
 
 
@@ -16,30 +17,20 @@ func (s *DockerSuite) TestPause(c *check.C) {
 
 
 	dockerCmd(c, "pause", name)
 	dockerCmd(c, "pause", name)
 	pausedContainers, err := getSliceOfPausedContainers()
 	pausedContainers, err := getSliceOfPausedContainers()
-	if err != nil {
-		c.Fatalf("error thrown while checking if containers were paused: %v", err)
-	}
-	if len(pausedContainers) != 1 {
-		c.Fatalf("there should be one paused container and not %d", len(pausedContainers))
-	}
+	c.Assert(err, checker.IsNil)
+	c.Assert(len(pausedContainers), checker.Equals, 1)
 
 
 	dockerCmd(c, "unpause", name)
 	dockerCmd(c, "unpause", name)
 
 
 	out, _ := dockerCmd(c, "events", "--since=0", fmt.Sprintf("--until=%d", daemonTime(c).Unix()))
 	out, _ := dockerCmd(c, "events", "--since=0", fmt.Sprintf("--until=%d", daemonTime(c).Unix()))
 	events := strings.Split(out, "\n")
 	events := strings.Split(out, "\n")
-	if len(events) <= 1 {
-		c.Fatalf("Missing expected event")
-	}
+	c.Assert(len(events) > 1, checker.Equals, true)
 
 
 	pauseEvent := strings.Fields(events[len(events)-3])
 	pauseEvent := strings.Fields(events[len(events)-3])
 	unpauseEvent := strings.Fields(events[len(events)-2])
 	unpauseEvent := strings.Fields(events[len(events)-2])
 
 
-	if pauseEvent[len(pauseEvent)-1] != "pause" {
-		c.Fatalf("event should be pause, not %#v", pauseEvent)
-	}
-	if unpauseEvent[len(unpauseEvent)-1] != "unpause" {
-		c.Fatalf("event should be unpause, not %#v", unpauseEvent)
-	}
+	c.Assert(pauseEvent[len(pauseEvent)-1], checker.Equals, "pause")
+	c.Assert(unpauseEvent[len(unpauseEvent)-1], checker.Equals, "unpause")
 
 
 }
 }
 
 
@@ -56,20 +47,14 @@ func (s *DockerSuite) TestPauseMultipleContainers(c *check.C) {
 	}
 	}
 	dockerCmd(c, append([]string{"pause"}, containers...)...)
 	dockerCmd(c, append([]string{"pause"}, containers...)...)
 	pausedContainers, err := getSliceOfPausedContainers()
 	pausedContainers, err := getSliceOfPausedContainers()
-	if err != nil {
-		c.Fatalf("error thrown while checking if containers were paused: %v", err)
-	}
-	if len(pausedContainers) != len(containers) {
-		c.Fatalf("there should be %d paused container and not %d", len(containers), len(pausedContainers))
-	}
+	c.Assert(err, checker.IsNil)
+	c.Assert(len(pausedContainers), checker.Equals, len(containers))
 
 
 	dockerCmd(c, append([]string{"unpause"}, containers...)...)
 	dockerCmd(c, append([]string{"unpause"}, containers...)...)
 
 
 	out, _ := dockerCmd(c, "events", "--since=0", fmt.Sprintf("--until=%d", daemonTime(c).Unix()))
 	out, _ := dockerCmd(c, "events", "--since=0", fmt.Sprintf("--until=%d", daemonTime(c).Unix()))
 	events := strings.Split(out, "\n")
 	events := strings.Split(out, "\n")
-	if len(events) <= len(containers)*3-2 {
-		c.Fatalf("Missing expected event")
-	}
+	c.Assert(len(events) > len(containers)*3-2, checker.Equals, true)
 
 
 	pauseEvents := make([][]string, len(containers))
 	pauseEvents := make([][]string, len(containers))
 	unpauseEvents := make([][]string, len(containers))
 	unpauseEvents := make([][]string, len(containers))
@@ -79,14 +64,10 @@ func (s *DockerSuite) TestPauseMultipleContainers(c *check.C) {
 	}
 	}
 
 
 	for _, pauseEvent := range pauseEvents {
 	for _, pauseEvent := range pauseEvents {
-		if pauseEvent[len(pauseEvent)-1] != "pause" {
-			c.Fatalf("event should be pause, not %#v", pauseEvent)
-		}
+		c.Assert(pauseEvent[len(pauseEvent)-1], checker.Equals, "pause")
 	}
 	}
 	for _, unpauseEvent := range unpauseEvents {
 	for _, unpauseEvent := range unpauseEvents {
-		if unpauseEvent[len(unpauseEvent)-1] != "unpause" {
-			c.Fatalf("event should be unpause, not %#v", unpauseEvent)
-		}
+		c.Assert(unpauseEvent[len(unpauseEvent)-1], checker.Equals, "unpause")
 	}
 	}
 
 
 }
 }