Browse code

Rebase from master

Signed-off-by: Liron Levin <liron@twistlock.com>

Liron Levin authored on 2015/12/09 00:37:59
Showing 2 changed files
... ...
@@ -41,9 +41,9 @@ type Config struct {
41 41
 
42 42
 // Server contains instance details for the server
43 43
 type Server struct {
44
-	cfg     *Config
45
-	servers []*HTTPServer
46
-	routers []router.Router
44
+	cfg          *Config
45
+	servers      []*HTTPServer
46
+	routers      []router.Router
47 47
 	authZPlugins []authorization.Plugin
48 48
 }
49 49
 
... ...
@@ -133,7 +133,7 @@ func (s *DockerSuite) TestHelpTextVerify(c *check.C) {
133 133
 			// Check each line for lots of stuff
134 134
 			lines := strings.Split(out, "\n")
135 135
 			for _, line := range lines {
136
-				c.Assert(len(line), checker.LessOrEqualThan, 91, check.Commentf("Help for %q is too long:\n%s", cmd, line))
136
+				c.Assert(len(line), checker.LessOrEqualThan, 103, check.Commentf("Help for %q is too long:\n%s", cmd, line))
137 137
 
138 138
 				if scanForHome && strings.Contains(line, `"`+home) {
139 139
 					c.Fatalf("Help for %q should use ~ instead of %q on:\n%s",