From 67e4d36e46196dcebe60320036826d02c5626cc7 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 5 Aug 2019 16:58:46 +0200 Subject: [PATCH] integration-cli: remove unused functions and enable disabled tests ``` 14:26:43 integration-cli/docker_cli_pull_local_test.go:64:6: U1000: func `testConcurrentPullWholeRepo` is unused (unused) 14:26:43 func testConcurrentPullWholeRepo(c *check.C) { 14:26:43 ^ 14:26:43 integration-cli/docker_cli_pull_local_test.go:111:31: U1000: func `(*DockerRegistrySuite).testConcurrentPullWholeRepo` is unused (unused) 14:26:43 func (s *DockerRegistrySuite) testConcurrentPullWholeRepo(c *check.C) { 14:26:43 ^ 14:26:43 integration-cli/docker_cli_pull_local_test.go:115:38: U1000: func `(*DockerSchema1RegistrySuite).testConcurrentPullWholeRepo` is unused (unused) 14:26:43 func (s *DockerSchema1RegistrySuite) testConcurrentPullWholeRepo(c *check.C) { 14:26:43 ^ 14:26:43 integration-cli/docker_cli_pull_local_test.go:120:6: U1000: func `testConcurrentFailingPull` is unused (unused) 14:26:43 func testConcurrentFailingPull(c *check.C) { 14:26:43 ^ 14:26:43 integration-cli/docker_cli_pull_local_test.go:142:31: U1000: func `(*DockerRegistrySuite).testConcurrentFailingPull` is unused (unused) 14:26:43 func (s *DockerRegistrySuite) testConcurrentFailingPull(c *check.C) { 14:26:43 ^ 14:26:43 integration-cli/docker_cli_pull_local_test.go:146:38: U1000: func `(*DockerSchema1RegistrySuite).testConcurrentFailingPull` is unused (unused) 14:26:43 func (s *DockerSchema1RegistrySuite) testConcurrentFailingPull(c *check.C) { 14:26:43 integration-cli/docker_utils_test.go:170:6: U1000: func `inspectImage` is unused (unused) 14:26:43 func inspectImage(c *check.C, name, filter string) string { 14:26:43 ^ 14:26:43 integration-cli/events_utils_test.go:196:6: U1000: func `parseEventsWithID` is unused (unused) 14:26:43 func parseEventsWithID(c *check.C, out, match, id string) { 14:26:43 ^ 14:26:43 integration-cli/fixtures_linux_daemon_test.go:17:6: U1000: type `testingT` is unused (unused) 14:26:43 type testingT interface { 14:26:43 ^ 14:26:43 integration-cli/fixtures_linux_daemon_test.go:19:2: U1000: func `testingT.Fatalf` is unused (unused) 14:26:43 Fatalf(string, ...interface{}) 14:26:43 ^ 14:26:43 integration-cli/fixtures_linux_daemon_test.go:22:6: U1000: type `logT` is unused (unused) 14:26:43 type logT interface { 14:26:43 ^ 14:26:43 integration-cli/fixtures_linux_daemon_test.go:23:2: U1000: func `logT.Logf` is unused (unused) 14:26:43 Logf(string, ...interface{}) ``` Signed-off-by: Sebastiaan van Stijn --- integration-cli/docker_cli_daemon_plugins_test.go | 14 -------------- integration-cli/docker_cli_pull_local_test.go | 8 ++++---- integration-cli/docker_utils_test.go | 14 -------------- integration-cli/events_utils_test.go | 12 ------------ integration-cli/fixtures_linux_daemon_test.go | 9 --------- 5 files changed, 4 insertions(+), 53 deletions(-) diff --git a/integration-cli/docker_cli_daemon_plugins_test.go b/integration-cli/docker_cli_daemon_plugins_test.go index a581d948c1..ee7fd9908b 100644 --- a/integration-cli/docker_cli_daemon_plugins_test.go +++ b/integration-cli/docker_cli_daemon_plugins_test.go @@ -6,7 +6,6 @@ import ( "strings" "testing" - "github.com/docker/docker/pkg/mount" "golang.org/x/sys/unix" "gotest.tools/assert" "gotest.tools/icmd" @@ -259,19 +258,6 @@ func (s *DockerDaemonSuite) TestPluginVolumeRemoveOnRestart(c *testing.T) { assert.NilError(c, err, out) } -func existsMountpointWithPrefix(mountpointPrefix string) (bool, error) { - mounts, err := mount.GetMounts(nil) - if err != nil { - return false, err - } - for _, mnt := range mounts { - if strings.HasPrefix(mnt.Mountpoint, mountpointPrefix) { - return true, nil - } - } - return false, nil -} - func (s *DockerDaemonSuite) TestPluginListFilterEnabled(c *testing.T) { testRequires(c, IsAmd64, Network) diff --git a/integration-cli/docker_cli_pull_local_test.go b/integration-cli/docker_cli_pull_local_test.go index eab316ac79..bcac21311d 100644 --- a/integration-cli/docker_cli_pull_local_test.go +++ b/integration-cli/docker_cli_pull_local_test.go @@ -107,11 +107,11 @@ func testConcurrentPullWholeRepo(c *testing.T) { } } -func (s *DockerRegistrySuite) testConcurrentPullWholeRepo(c *testing.T) { +func (s *DockerRegistrySuite) TestConcurrentPullWholeRepo(c *testing.T) { testConcurrentPullWholeRepo(c) } -func (s *DockerSchema1RegistrySuite) testConcurrentPullWholeRepo(c *testing.T) { +func (s *DockerSchema1RegistrySuite) TestConcurrentPullWholeRepo(c *testing.T) { testConcurrentPullWholeRepo(c) } @@ -138,11 +138,11 @@ func testConcurrentFailingPull(c *testing.T) { } } -func (s *DockerRegistrySuite) testConcurrentFailingPull(c *testing.T) { +func (s *DockerRegistrySuite) TestConcurrentFailingPull(c *testing.T) { testConcurrentFailingPull(c) } -func (s *DockerSchema1RegistrySuite) testConcurrentFailingPull(c *testing.T) { +func (s *DockerSchema1RegistrySuite) TestConcurrentFailingPull(c *testing.T) { testConcurrentFailingPull(c) } diff --git a/integration-cli/docker_utils_test.go b/integration-cli/docker_utils_test.go index 3ee6b7c098..f817681fcd 100644 --- a/integration-cli/docker_utils_test.go +++ b/integration-cli/docker_utils_test.go @@ -174,20 +174,6 @@ func inspectMountPointJSON(j, destination string) (types.MountPoint, error) { return *m, nil } -// Deprecated: use cli.Inspect -func inspectImage(c *testing.T, name, filter string) string { - c.Helper() - args := []string{"inspect", "--type", "image"} - if filter != "" { - format := fmt.Sprintf("{{%s}}", filter) - args = append(args, "-f", format) - } - args = append(args, name) - result := icmd.RunCommand(dockerBinary, args...) - result.Assert(c, icmd.Success) - return strings.TrimSpace(result.Combined()) -} - func getIDByName(c *testing.T, name string) string { c.Helper() id, err := inspectFieldWithError(name, "Id") diff --git a/integration-cli/events_utils_test.go b/integration-cli/events_utils_test.go index 0bd923d148..a9116102a7 100644 --- a/integration-cli/events_utils_test.go +++ b/integration-cli/events_utils_test.go @@ -192,15 +192,3 @@ func parseEvents(c *testing.T, out, match string) { assert.Assert(c, matched, "Matcher: %s did not match %s", match, matches["action"]) } } - -func parseEventsWithID(c *testing.T, out, match, id string) { - events := strings.Split(strings.TrimSpace(out), "\n") - for _, event := range events { - matches := eventstestutils.ScanMap(event) - assert.Assert(c, matchEventID(matches, id)) - - matched, err := regexp.MatchString(match, matches["action"]) - assert.NilError(c, err) - assert.Assert(c, matched, "Matcher: %s did not match %s", match, matches["action"]) - } -} diff --git a/integration-cli/fixtures_linux_daemon_test.go b/integration-cli/fixtures_linux_daemon_test.go index d708173f92..92a0ceadd2 100644 --- a/integration-cli/fixtures_linux_daemon_test.go +++ b/integration-cli/fixtures_linux_daemon_test.go @@ -14,15 +14,6 @@ import ( "gotest.tools/assert" ) -type testingT interface { - logT - Fatalf(string, ...interface{}) -} - -type logT interface { - Logf(string, ...interface{}) -} - func ensureSyscallTest(c *testing.T) { defer testEnv.ProtectImage(c, "syscall-test:latest")