From 9c49308ccee99e6a9ca3b9acd44e48684b161f3f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 6 Jun 2019 13:00:37 +0200 Subject: [PATCH] integration: change container.Create signature to fix linting ``` Line 25: warning: context.Context should be the first parameter of a function (golint) Line 44: warning: context.Context should be the first parameter of a function (golint) Line 52: warning: context.Context should be the first parameter of a function (golint) ``` Signed-off-by: Sebastiaan van Stijn (cherry picked from commit b4c46b0dac0d74fed8b8adc56cbb7f55788e4916) Signed-off-by: Sebastiaan van Stijn --- integration/container/copy_test.go | 8 ++++---- integration/container/daemon_linux_test.go | 2 +- integration/container/export_test.go | 2 +- integration/container/ipcmode_linux_test.go | 4 ++-- integration/container/kill_test.go | 4 ++-- integration/container/ps_test.go | 6 +++--- integration/image/commit_test.go | 4 ++-- integration/image/remove_test.go | 4 ++-- integration/internal/container/container.go | 5 ++--- integration/service/network_test.go | 4 ++-- integration/system/cgroupdriver_systemd_test.go | 2 +- integration/system/event_test.go | 2 +- integration/volume/volume_test.go | 2 +- 13 files changed, 24 insertions(+), 25 deletions(-) diff --git a/integration/container/copy_test.go b/integration/container/copy_test.go index 218b575921..0b6123a80b 100644 --- a/integration/container/copy_test.go +++ b/integration/container/copy_test.go @@ -26,7 +26,7 @@ func TestCopyFromContainerPathDoesNotExist(t *testing.T) { ctx := context.Background() apiclient := testEnv.APIClient() - cid := container.Create(t, ctx, apiclient) + cid := container.Create(ctx, t, apiclient) _, _, err := apiclient.CopyFromContainer(ctx, cid, "/dne") assert.Check(t, client.IsErrNotFound(err)) @@ -40,7 +40,7 @@ func TestCopyFromContainerPathIsNotDir(t *testing.T) { ctx := context.Background() apiclient := testEnv.APIClient() - cid := container.Create(t, ctx, apiclient) + cid := container.Create(ctx, t, apiclient) _, _, err := apiclient.CopyFromContainer(ctx, cid, "/etc/passwd/") assert.Assert(t, is.ErrorContains(err, "not a directory")) @@ -52,7 +52,7 @@ func TestCopyToContainerPathDoesNotExist(t *testing.T) { ctx := context.Background() apiclient := testEnv.APIClient() - cid := container.Create(t, ctx, apiclient) + cid := container.Create(ctx, t, apiclient) err := apiclient.CopyToContainer(ctx, cid, "/dne", nil, types.CopyToContainerOptions{}) assert.Check(t, client.IsErrNotFound(err)) @@ -66,7 +66,7 @@ func TestCopyToContainerPathIsNotDir(t *testing.T) { ctx := context.Background() apiclient := testEnv.APIClient() - cid := container.Create(t, ctx, apiclient) + cid := container.Create(ctx, t, apiclient) err := apiclient.CopyToContainer(ctx, cid, "/etc/passwd/", nil, types.CopyToContainerOptions{}) assert.Assert(t, is.ErrorContains(err, "not a directory")) diff --git a/integration/container/daemon_linux_test.go b/integration/container/daemon_linux_test.go index efb97c5aac..e96d0057f3 100644 --- a/integration/container/daemon_linux_test.go +++ b/integration/container/daemon_linux_test.go @@ -40,7 +40,7 @@ func TestContainerStartOnDaemonRestart(t *testing.T) { ctx := context.Background() - cID := container.Create(t, ctx, c) + cID := container.Create(ctx, t, c) defer c.ContainerRemove(ctx, cID, types.ContainerRemoveOptions{Force: true}) err := c.ContainerStart(ctx, cID, types.ContainerStartOptions{}) diff --git a/integration/container/export_test.go b/integration/container/export_test.go index 6727a67edc..8d64d42510 100644 --- a/integration/container/export_test.go +++ b/integration/container/export_test.go @@ -67,7 +67,7 @@ func TestExportContainerAfterDaemonRestart(t *testing.T) { defer d.Stop(t) ctx := context.Background() - ctrID := container.Create(t, ctx, c) + ctrID := container.Create(ctx, t, c) d.Restart(t) diff --git a/integration/container/ipcmode_linux_test.go b/integration/container/ipcmode_linux_test.go index 5b07c0e822..2cb5f9b710 100644 --- a/integration/container/ipcmode_linux_test.go +++ b/integration/container/ipcmode_linux_test.go @@ -308,7 +308,7 @@ func TestIpcModeOlderClient(t *testing.T) { ctx := context.Background() // pre-check: default ipc mode in daemon is private - cID := container.Create(t, ctx, c, container.WithAutoRemove) + cID := container.Create(ctx, t, c, container.WithAutoRemove) inspect, err := c.ContainerInspect(ctx, cID) assert.NilError(t, err) @@ -316,7 +316,7 @@ func TestIpcModeOlderClient(t *testing.T) { // main check: using older client creates "shareable" container c = request.NewAPIClient(t, client.WithVersion("1.39")) - cID = container.Create(t, ctx, c, container.WithAutoRemove) + cID = container.Create(ctx, t, c, container.WithAutoRemove) inspect, err = c.ContainerInspect(ctx, cID) assert.NilError(t, err) diff --git a/integration/container/kill_test.go b/integration/container/kill_test.go index 60f4f179bd..7b47f34439 100644 --- a/integration/container/kill_test.go +++ b/integration/container/kill_test.go @@ -113,7 +113,7 @@ func TestKillStoppedContainer(t *testing.T) { defer setupTest(t)() ctx := context.Background() client := testEnv.APIClient() - id := container.Create(t, ctx, client) + id := container.Create(ctx, t, client) err := client.ContainerKill(ctx, id, "SIGKILL") assert.Assert(t, is.ErrorContains(err, "")) assert.Assert(t, is.Contains(err.Error(), "is not running")) @@ -124,7 +124,7 @@ func TestKillStoppedContainerAPIPre120(t *testing.T) { defer setupTest(t)() ctx := context.Background() client := request.NewAPIClient(t, client.WithVersion("1.19")) - id := container.Create(t, ctx, client) + id := container.Create(ctx, t, client) err := client.ContainerKill(ctx, id, "SIGKILL") assert.NilError(t, err) } diff --git a/integration/container/ps_test.go b/integration/container/ps_test.go index 93721bc08b..7c04ac307f 100644 --- a/integration/container/ps_test.go +++ b/integration/container/ps_test.go @@ -16,9 +16,9 @@ func TestPsFilter(t *testing.T) { client := testEnv.APIClient() ctx := context.Background() - prev := container.Create(t, ctx, client) - top := container.Create(t, ctx, client) - next := container.Create(t, ctx, client) + prev := container.Create(ctx, t, client) + top := container.Create(ctx, t, client) + next := container.Create(ctx, t, client) containerIDs := func(containers []types.Container) []string { var entries []string diff --git a/integration/image/commit_test.go b/integration/image/commit_test.go index 996f3716a9..26850c52da 100644 --- a/integration/image/commit_test.go +++ b/integration/image/commit_test.go @@ -19,7 +19,7 @@ func TestCommitInheritsEnv(t *testing.T) { client := testEnv.APIClient() ctx := context.Background() - cID1 := container.Create(t, ctx, client) + cID1 := container.Create(ctx, t, client) commitResp1, err := client.ContainerCommit(ctx, cID1, types.ContainerCommitOptions{ Changes: []string{"ENV PATH=/bin"}, @@ -33,7 +33,7 @@ func TestCommitInheritsEnv(t *testing.T) { expectedEnv1 := []string{"PATH=/bin"} assert.Check(t, is.DeepEqual(expectedEnv1, image1.Config.Env)) - cID2 := container.Create(t, ctx, client, container.WithImage(image1.ID)) + cID2 := container.Create(ctx, t, client, container.WithImage(image1.ID)) commitResp2, err := client.ContainerCommit(ctx, cID2, types.ContainerCommitOptions{ Changes: []string{"ENV PATH=/usr/bin:$PATH"}, diff --git a/integration/image/remove_test.go b/integration/image/remove_test.go index 68ef9aa1ec..603f191b4f 100644 --- a/integration/image/remove_test.go +++ b/integration/image/remove_test.go @@ -20,7 +20,7 @@ func TestRemoveImageOrphaning(t *testing.T) { img := "test-container-orphaning" // Create a container from busybox, and commit a small change so we have a new image - cID1 := container.Create(t, ctx, client, container.WithCmd("")) + cID1 := container.Create(ctx, t, client, container.WithCmd("")) commitResp1, err := client.ContainerCommit(ctx, cID1, types.ContainerCommitOptions{ Changes: []string{`ENTRYPOINT ["true"]`}, Reference: img, @@ -33,7 +33,7 @@ func TestRemoveImageOrphaning(t *testing.T) { assert.Check(t, is.Equal(resp.ID, commitResp1.ID)) // Create a container from created image, and commit a small change with same reference name - cID2 := container.Create(t, ctx, client, container.WithImage(img), container.WithCmd("")) + cID2 := container.Create(ctx, t, client, container.WithImage(img), container.WithCmd("")) commitResp2, err := client.ContainerCommit(ctx, cID2, types.ContainerCommitOptions{ Changes: []string{`LABEL Maintainer="Integration Tests"`}, Reference: img, diff --git a/integration/internal/container/container.go b/integration/internal/container/container.go index 85e6a24fe7..468fcbe343 100644 --- a/integration/internal/container/container.go +++ b/integration/internal/container/container.go @@ -22,8 +22,7 @@ type TestContainerConfig struct { } // Create creates a container with the specified options -// nolint: golint -func Create(t *testing.T, ctx context.Context, client client.APIClient, ops ...func(*TestContainerConfig)) string { // nolint: golint +func Create(ctx context.Context, t *testing.T, client client.APIClient, ops ...func(*TestContainerConfig)) string { t.Helper() cmd := []string{"top"} if runtime.GOOS == "windows" { @@ -52,7 +51,7 @@ func Create(t *testing.T, ctx context.Context, client client.APIClient, ops ...f // nolint: golint func Run(t *testing.T, ctx context.Context, client client.APIClient, ops ...func(*TestContainerConfig)) string { // nolint: golint t.Helper() - id := Create(t, ctx, client, ops...) + id := Create(ctx, t, client, ops...) err := client.ContainerStart(ctx, id, types.ContainerStartOptions{}) assert.NilError(t, err) diff --git a/integration/service/network_test.go b/integration/service/network_test.go index 9a9717db3d..85cd8b47e7 100644 --- a/integration/service/network_test.go +++ b/integration/service/network_test.go @@ -29,7 +29,7 @@ func TestDockerNetworkConnectAlias(t *testing.T) { net.WithAttachable(), ) - cID1 := container.Create(t, ctx, client, func(c *container.TestContainerConfig) { + cID1 := container.Create(ctx, t, client, func(c *container.TestContainerConfig) { c.NetworkingConfig = &network.NetworkingConfig{ EndpointsConfig: map[string]*network.EndpointSettings{ name: {}, @@ -52,7 +52,7 @@ func TestDockerNetworkConnectAlias(t *testing.T) { assert.Check(t, is.Equal(len(ng1.NetworkSettings.Networks[name].Aliases), 2)) assert.Check(t, is.Equal(ng1.NetworkSettings.Networks[name].Aliases[0], "aaa")) - cID2 := container.Create(t, ctx, client, func(c *container.TestContainerConfig) { + cID2 := container.Create(ctx, t, client, func(c *container.TestContainerConfig) { c.NetworkingConfig = &network.NetworkingConfig{ EndpointsConfig: map[string]*network.EndpointSettings{ name: {}, diff --git a/integration/system/cgroupdriver_systemd_test.go b/integration/system/cgroupdriver_systemd_test.go index bc076aafd5..b277ccaa08 100644 --- a/integration/system/cgroupdriver_systemd_test.go +++ b/integration/system/cgroupdriver_systemd_test.go @@ -41,7 +41,7 @@ func TestCgroupDriverSystemdMemoryLimit(t *testing.T) { const mem = 64 * 1024 * 1024 // 64 MB ctx := context.Background() - ctrID := container.Create(t, ctx, c, func(ctr *container.TestContainerConfig) { + ctrID := container.Create(ctx, t, c, func(ctr *container.TestContainerConfig) { ctr.HostConfig.Resources.Memory = mem }) defer c.ContainerRemove(ctx, ctrID, types.ContainerRemoveOptions{Force: true}) diff --git a/integration/system/event_test.go b/integration/system/event_test.go index c7548a61a8..2d8044ea5e 100644 --- a/integration/system/event_test.go +++ b/integration/system/event_test.go @@ -83,7 +83,7 @@ func TestEventsBackwardsCompatible(t *testing.T) { since := request.DaemonTime(ctx, t, client, testEnv) ts := strconv.FormatInt(since.Unix(), 10) - cID := container.Create(t, ctx, client) + cID := container.Create(ctx, t, client) // In case there is no events, the API should have responded immediately (not blocking), // The test here makes sure the response time is less than 3 sec. diff --git a/integration/volume/volume_test.go b/integration/volume/volume_test.go index a16a1da2e7..0336b943bc 100644 --- a/integration/volume/volume_test.go +++ b/integration/volume/volume_test.go @@ -68,7 +68,7 @@ func TestVolumesRemove(t *testing.T) { prefix, slash := getPrefixAndSlashFromDaemonPlatform() - id := container.Create(t, ctx, client, container.WithVolume(prefix+slash+"foo")) + id := container.Create(ctx, t, client, container.WithVolume(prefix+slash+"foo")) c, err := client.ContainerInspect(ctx, id) assert.NilError(t, err)