From 3521e40e1a476b41a5c86bd47c6584f717278ad8 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Wed, 28 Feb 2018 17:15:25 +0000 Subject: [PATCH 1/3] Remove docker_cli_secret_inspect_test.go as the test (TestSecretInspectMultiple) seems to have been covered pretty well in cli: https://github.com/docker/cli/blob/master/cli/command/secret/inspect_test.go Signed-off-by: Yong Tang Upstream-commit: 3d38adb20c619b87edab72e51ff0fd1cf6e08691 Component: engine --- .../docker_cli_secret_inspect_test.go | 45 ------------------- 1 file changed, 45 deletions(-) delete mode 100644 components/engine/integration-cli/docker_cli_secret_inspect_test.go diff --git a/components/engine/integration-cli/docker_cli_secret_inspect_test.go b/components/engine/integration-cli/docker_cli_secret_inspect_test.go deleted file mode 100644 index 429e9ad108..0000000000 --- a/components/engine/integration-cli/docker_cli_secret_inspect_test.go +++ /dev/null @@ -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) -} From 82ee559ff860a7f253eb708cbd89a02dab72dfb3 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 1 Mar 2018 14:16:19 +0100 Subject: [PATCH 2/3] Fix "expected" and "actual" being reversed Signed-off-by: Sebastiaan van Stijn Upstream-commit: a2517cbf62d75c48861337182aa841c5089f8ac4 Component: engine --- components/engine/integration/container/nat_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/engine/integration/container/nat_test.go b/components/engine/integration/container/nat_test.go index ad93e59f49..6997ed0515 100644 --- a/components/engine/integration/container/nat_test.go +++ b/components/engine/integration/container/nat_test.go @@ -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) From 59d8a525c83b16212d885b46d33918f0f8c346ba Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Thu, 1 Mar 2018 22:51:11 +0000 Subject: [PATCH 3/3] Add missing canonical import comment to files in integration tests The canonical import comment was added some time ago, though several newly added files do not have the comment. This fix adds the missing canonical import comment to files in integration tests Signed-off-by: Yong Tang Upstream-commit: 9045406144413920da49629a181bb787c670197e Component: engine --- components/engine/integration/config/config_test.go | 2 +- components/engine/integration/config/main_test.go | 2 +- components/engine/integration/container/daemon_linux_test.go | 2 +- components/engine/integration/container/kill_test.go | 2 +- components/engine/integration/container/logs_test.go | 2 +- components/engine/integration/container/nat_test.go | 2 +- components/engine/integration/secret/main_test.go | 2 +- components/engine/integration/secret/secret_test.go | 2 +- components/engine/integration/system/info_test.go | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/engine/integration/config/config_test.go b/components/engine/integration/config/config_test.go index 4e31b205ee..912f55a12a 100644 --- a/components/engine/integration/config/config_test.go +++ b/components/engine/integration/config/config_test.go @@ -1,4 +1,4 @@ -package config +package config // import "github.com/docker/docker/integration/config" import ( "bytes" diff --git a/components/engine/integration/config/main_test.go b/components/engine/integration/config/main_test.go index 32df97d2c6..3c8f0483f2 100644 --- a/components/engine/integration/config/main_test.go +++ b/components/engine/integration/config/main_test.go @@ -1,4 +1,4 @@ -package config +package config // import "github.com/docker/docker/integration/config" import ( "fmt" diff --git a/components/engine/integration/container/daemon_linux_test.go b/components/engine/integration/container/daemon_linux_test.go index 46881bca56..5e15562ae8 100644 --- a/components/engine/integration/container/daemon_linux_test.go +++ b/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" diff --git a/components/engine/integration/container/kill_test.go b/components/engine/integration/container/kill_test.go index 09e37ac0d1..45400883fa 100644 --- a/components/engine/integration/container/kill_test.go +++ b/components/engine/integration/container/kill_test.go @@ -1,4 +1,4 @@ -package container +package container // import "github.com/docker/docker/integration/container" import ( "context" diff --git a/components/engine/integration/container/logs_test.go b/components/engine/integration/container/logs_test.go index 1157da14b8..0aa025fc7b 100644 --- a/components/engine/integration/container/logs_test.go +++ b/components/engine/integration/container/logs_test.go @@ -1,4 +1,4 @@ -package container +package container // import "github.com/docker/docker/integration/container" import ( "context" diff --git a/components/engine/integration/container/nat_test.go b/components/engine/integration/container/nat_test.go index 6997ed0515..84df4960a2 100644 --- a/components/engine/integration/container/nat_test.go +++ b/components/engine/integration/container/nat_test.go @@ -1,4 +1,4 @@ -package container +package container // import "github.com/docker/docker/integration/container" import ( "bytes" diff --git a/components/engine/integration/secret/main_test.go b/components/engine/integration/secret/main_test.go index 6a5b0985d4..4a3d4c75e9 100644 --- a/components/engine/integration/secret/main_test.go +++ b/components/engine/integration/secret/main_test.go @@ -1,4 +1,4 @@ -package secret +package secret // import "github.com/docker/docker/integration/secret" import ( "fmt" diff --git a/components/engine/integration/secret/secret_test.go b/components/engine/integration/secret/secret_test.go index 8a292f005b..27c8fd3d0e 100644 --- a/components/engine/integration/secret/secret_test.go +++ b/components/engine/integration/secret/secret_test.go @@ -1,4 +1,4 @@ -package secret +package secret // import "github.com/docker/docker/integration/secret" import ( "bytes" diff --git a/components/engine/integration/system/info_test.go b/components/engine/integration/system/info_test.go index 47c46cb871..d04fdcdc84 100644 --- a/components/engine/integration/system/info_test.go +++ b/components/engine/integration/system/info_test.go @@ -1,4 +1,4 @@ -package system +package system // import "github.com/docker/docker/integration/system" import ( "fmt"