Merge pull request moby#16871 from ZJU-SEL/fix_version_test

cpuguy83 · cpuguy83 · commit 9b1fb0d45b09 · 2015-10-17T08:02:18.000-04:00
update docker_cli_version_test.go
diff --git a/integration-cli/docker_cli_version_test.go b/integration-cli/docker_cli_version_test.go
@@ -3,6 +3,7 @@ package main
 import (
 	"strings"
 
+	"github.com/docker/docker/pkg/integration/checker"
 	"github.com/go-check/check"
 )
 
@@ -21,9 +22,7 @@ func (s *DockerSuite) TestVersionEnsureSucceeds(c *check.C) {
 	}
 
 	for k, v := range stringsToCheck {
-		if strings.Count(out, k) != v {
-			c.Errorf("%v expected %d instances found %d", k, v, strings.Count(out, k))
-		}
+		c.Assert(strings.Count(out, k), checker.Equals, v, check.Commentf("The count of %v in %s does not match excepted", k, out))
 	}
 }
 
@@ -44,9 +43,7 @@ func testVersionPlatform(c *check.C, platform string) {
 	expected := "OS/Arch:      " + platform
 
 	split := strings.Split(out, "\n")
-	if len(split) < 14 { // To avoid invalid indexing in loop below
-		c.Errorf("got %d lines from version", len(split))
-	}
+	c.Assert(len(split) >= 14, checker.Equals, true, check.Commentf("got %d lines from version", len(split)))
 
 	// Verify the second 'OS/Arch' matches the platform. Experimental has
 	// more lines of output than 'regular'
@@ -57,7 +54,5 @@ func testVersionPlatform(c *check.C, platform string) {
 			break
 		}
 	}
-	if !bFound {
-		c.Errorf("Could not find server '%s' in '%s'", expected, out)
-	}
+	c.Assert(bFound, checker.Equals, true, check.Commentf("Could not find server '%s' in '%s'", expected, out))
 }

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package main`
`3`	`3`	`import (`
`4`	`4`	`"strings"`
`5`	`5`
	`6`	`+ "github.com/docker/docker/pkg/integration/checker"`
`6`	`7`	`"github.com/go-check/check"`
`7`	`8`	`)`
`8`	`9`
`@@ -21,9 +22,7 @@ func (s DockerSuite) TestVersionEnsureSucceeds(c check.C) {`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`for k, v := range stringsToCheck {`
`24`		`- if strings.Count(out, k) != v {`
`25`		`- c.Errorf("%v expected %d instances found %d", k, v, strings.Count(out, k))`
`26`		`- }`
	`25`	`+ c.Assert(strings.Count(out, k), checker.Equals, v, check.Commentf("The count of %v in %s does not match excepted", k, out))`
`27`	`26`	`}`
`28`	`27`	`}`
`29`	`28`
`@@ -44,9 +43,7 @@ func testVersionPlatform(c *check.C, platform string) {`
`44`	`43`	`expected := "OS/Arch: " + platform`
`45`	`44`
`46`	`45`	`split := strings.Split(out, "\n")`
`47`		`- if len(split) < 14 { // To avoid invalid indexing in loop below`
`48`		`- c.Errorf("got %d lines from version", len(split))`
`49`		`- }`
	`46`	`+ c.Assert(len(split) >= 14, checker.Equals, true, check.Commentf("got %d lines from version", len(split)))`
`50`	`47`
`51`	`48`	`// Verify the second 'OS/Arch' matches the platform. Experimental has`
`52`	`49`	`// more lines of output than 'regular'`
`@@ -57,7 +54,5 @@ func testVersionPlatform(c *check.C, platform string) {`
`57`	`54`	`break`
`58`	`55`	`}`
`59`	`56`	`}`
`60`		`- if !bFound {`
`61`		`- c.Errorf("Could not find server '%s' in '%s'", expected, out)`
`62`		`- }`
	`57`	`+ c.Assert(bFound, checker.Equals, true, check.Commentf("Could not find server '%s' in '%s'", expected, out))`
`63`	`58`	`}`