fix coding style and have make validate pass

Signed-off-by: Tibor Vass <tibor@docker.com>

integration-cli/docker_cli_info_test.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"fmt"
-	"strings"
 	"net"
+	"strings"
 
 	"github.com/docker/docker/pkg/integration/checker"
 	"github.com/docker/docker/utils"
@@ -92,7 +92,7 @@ func (s *DockerSuite) TestInfoDiscoveryAdvertiseInterfaceName(c *check.C) {
 	addrs, err := iface.Addrs()
 	c.Assert(err, checker.IsNil)
 	if len(addrs) <= 0 {
-		c.Fatalf("addrs %v has to have at least one element")
+		c.Fatalf("addrs %v has to have at least one element", addrs)
 	}
 	ip, _, err := net.ParseCIDR(addrs[0].String())
 	c.Assert(err, checker.IsNil)

integration-cli/docker_cli_rmi_test.go

@@ -273,7 +273,7 @@ func (s *DockerSuite) TestRmiForceWithMultipleRepositories(c *check.C) {
 	if !strings.Contains(out, "Untagged: "+tag2) {
 		c.Fatalf("should contain Untagged: %s", tag2)
 	}
-	if strings.Contains(out, "Untagged: " + tag1) {
+	if strings.Contains(out, "Untagged: "+tag1) {
 		c.Fatalf("should not contain Untagged: %s", tag1)
 	}