Rebase from master

Signed-off-by: Liron Levin <liron@twistlock.com>
Upstream-commit: f28230d35c19befe5d6799667f37c1362dd1b782
Component: engine
This commit is contained in:
Liron Levin
2015-12-08 17:37:59 +02:00
parent 1c96ff9a0b
commit be83c5ad37
2 changed files with 4 additions and 4 deletions

View File

@ -133,7 +133,7 @@ func (s *DockerSuite) TestHelpTextVerify(c *check.C) {
// Check each line for lots of stuff
lines := strings.Split(out, "\n")
for _, line := range lines {
c.Assert(len(line), checker.LessOrEqualThan, 91, check.Commentf("Help for %q is too long:\n%s", cmd, line))
c.Assert(len(line), checker.LessOrEqualThan, 103, check.Commentf("Help for %q is too long:\n%s", cmd, line))
if scanForHome && strings.Contains(line, `"`+home) {
c.Fatalf("Help for %q should use ~ instead of %q on:\n%s",