p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #16871 from ZJU-SEL/fix_version_test

Browse Source 
update docker_cli_version_test.go
Upstream-commit: 9b1fb0d45b09f72e368e4f5d025ea592ee002007
Component: engine
This commit is contained in:
Brian Goff
2015-10-17 08:02:18 -04:00
parent efafa4e0c7 adcbd88f40
commit 17e4fec1fd
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/engine/integration-cli/docker_cli_version_test.go
View File

@ -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))
}