From 40f1950e8ea84a8518c7378d0e8cbe9142e3b0cf Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Fri, 16 Aug 2019 23:36:18 +0000 Subject: [PATCH] fix remaining issues with checker.Not Signed-off-by: Tibor Vass --- integration-cli/docker_cli_prune_unix_test.go | 3 +-- integration-cli/docker_cli_swarm_test.go | 2 +- pkg/discovery/discovery_test.go | 11 +++++------ 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/integration-cli/docker_cli_prune_unix_test.go b/integration-cli/docker_cli_prune_unix_test.go index 734e281999..818af6a23e 100644 --- a/integration-cli/docker_cli_prune_unix_test.go +++ b/integration-cli/docker_cli_prune_unix_test.go @@ -38,8 +38,7 @@ func pruneNetworkAndVerify(c *testing.T, d *daemon.Daemon, kept, pruned []string out, err := d.Cmd("network", "ls", "--format", "{{.Name}}") assert.NilError(c, err) return out, "" - }, checker.Not(checker.Contains(s))()), poll.WithTimeout(defaultReconciliationTimeout)) - + }, checker.Not(checker.Contains(s))), poll.WithTimeout(defaultReconciliationTimeout)) } } diff --git a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_cli_swarm_test.go index 8d6f64880d..5ad014f0a6 100644 --- a/integration-cli/docker_cli_swarm_test.go +++ b/integration-cli/docker_cli_swarm_test.go @@ -389,7 +389,7 @@ func (s *DockerSwarmSuite) TestSwarmContainerAttachByNetworkId(c *testing.T) { return out, "" } - poll.WaitOn(c, pollCheck(c, checkNetwork, checker.Not(checker.Contains("testnet"))()), poll.WithTimeout(3*time.Second)) + poll.WaitOn(c, pollCheck(c, checkNetwork, checker.Not(checker.Contains("testnet"))), poll.WithTimeout(3*time.Second)) } func (s *DockerSwarmSuite) TestOverlayAttachable(c *testing.T) { diff --git a/pkg/discovery/discovery_test.go b/pkg/discovery/discovery_test.go index 3dbc31c2a9..7a0ce95988 100644 --- a/pkg/discovery/discovery_test.go +++ b/pkg/discovery/discovery_test.go @@ -3,7 +3,6 @@ package discovery // import "github.com/docker/docker/pkg/discovery" import ( "testing" - "github.com/docker/docker/integration-cli/checker" "gotest.tools/assert" ) @@ -86,20 +85,20 @@ func (s *DiscoverySuite) TestEntriesEquality(c *testing.T) { assert.Assert(c, entries.Equals(Entries{ &Entry{Host: "127.0.0.1", Port: "2375"}, &Entry{Host: "127.0.0.2", Port: "2375"}, - }), checker.Equals, true) + })) // Different size - assert.Assert(c, entries.Equals(Entries{ + assert.Assert(c, !entries.Equals(Entries{ &Entry{Host: "127.0.0.1", Port: "2375"}, &Entry{Host: "127.0.0.2", Port: "2375"}, &Entry{Host: "127.0.0.3", Port: "2375"}, - }), checker.Equals, false) + })) // Different content - assert.Assert(c, entries.Equals(Entries{ + assert.Assert(c, !entries.Equals(Entries{ &Entry{Host: "127.0.0.1", Port: "2375"}, &Entry{Host: "127.0.0.42", Port: "2375"}, - }), checker.Equals, false) + })) }