Merge component 'engine' from git@github.com:moby/moby master

components/engine/integration-cli/docker_cli_secret_inspect_test.go

@@ -1,45 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/integration-cli/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSwarmSuite) TestSecretInspectMultiple(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	testNames := []string{
-		"test0",
-		"test1",
-	}
-	for _, n := range testNames {
-		id := d.CreateSecret(c, swarm.SecretSpec{
-			Annotations: swarm.Annotations{
-				Name: n,
-			},
-			Data: []byte("TESTINGDATA"),
-		})
-		c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", id))
-
-		secret := d.GetSecret(c, id)
-		c.Assert(secret.Spec.Name, checker.Equals, n)
-
-	}
-
-	args := []string{
-		"secret",
-		"inspect",
-	}
-	args = append(args, testNames...)
-	out, err := d.Cmd(args...)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	var secrets []swarm.Secret
-	c.Assert(json.Unmarshal([]byte(out), &secrets), checker.IsNil)
-	c.Assert(secrets, checker.HasLen, 2)
-}

components/engine/integration/config/config_test.go

@@ -1,4 +1,4 @@
-package config
+package config // import "github.com/docker/docker/integration/config"
 
 import (
 	"bytes"

components/engine/integration/config/main_test.go

@@ -1,4 +1,4 @@
-package config
+package config // import "github.com/docker/docker/integration/config"
 
 import (
 	"fmt"

components/engine/integration/container/daemon_linux_test.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/integration/container"
 
 import (
 	"context"

components/engine/integration/container/kill_test.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/integration/container"
 
 import (
 	"context"

components/engine/integration/container/logs_test.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/integration/container"
 
 import (
 	"context"

components/engine/integration/container/nat_test.go

@@ -1,4 +1,4 @@
-package container
+package container // import "github.com/docker/docker/integration/container"
 
 import (
 	"bytes"
@@ -36,7 +36,7 @@ func TestNetworkNat(t *testing.T) {
 
 	data, err := ioutil.ReadAll(conn)
 	require.NoError(t, err)
-	assert.Equal(t, strings.TrimSpace(string(data)), msg)
+	assert.Equal(t, msg, strings.TrimSpace(string(data)))
 }
 
 func TestNetworkLocalhostTCPNat(t *testing.T) {
@@ -53,7 +53,7 @@ func TestNetworkLocalhostTCPNat(t *testing.T) {
 
 	data, err := ioutil.ReadAll(conn)
 	require.NoError(t, err)
-	assert.Equal(t, strings.TrimSpace(string(data)), msg)
+	assert.Equal(t, msg, strings.TrimSpace(string(data)))
 }
 
 func TestNetworkLoopbackNat(t *testing.T) {
@@ -81,7 +81,7 @@ func TestNetworkLoopbackNat(t *testing.T) {
 	_, err = io.Copy(&b, body)
 	require.NoError(t, err)
 
-	assert.Equal(t, strings.TrimSpace(b.String()), msg)
+	assert.Equal(t, msg, strings.TrimSpace(b.String()))
 }
 
 func startServerContainer(t *testing.T, msg string, port int) string {
@@ -109,7 +109,7 @@ func getExternalAddress(t *testing.T) net.IP {
 
 	ifaceAddrs, err := iface.Addrs()
 	require.NoError(t, err)
-	assert.NotEqual(t, len(ifaceAddrs), 0)
+	assert.NotEqual(t, 0, len(ifaceAddrs))
 
 	ifaceIP, _, err := net.ParseCIDR(ifaceAddrs[0].String())
 	require.NoError(t, err)

components/engine/integration/secret/main_test.go

@@ -1,4 +1,4 @@
-package secret
+package secret // import "github.com/docker/docker/integration/secret"
 
 import (
 	"fmt"

components/engine/integration/secret/secret_test.go

@@ -1,4 +1,4 @@
-package secret
+package secret // import "github.com/docker/docker/integration/secret"
 
 import (
 	"bytes"

components/engine/integration/system/info_test.go

@@ -1,4 +1,4 @@
-package system
+package system // import "github.com/docker/docker/integration/system"
 
 import (
 	"fmt"