This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[19.03 backport] Integration: change signatures to fix golint warnings#281

Merged
andrewhsu merged 8 commits into from
Sep 23, 2019
Merged

[19.03 backport] Integration: change signatures to fix golint warnings #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
235fa0e
Revert "integration: have container.Create call compile"
thaJeztah Aug 13, 2019
9175772
integration: change network.CreateNoError signature to fix linting
thaJeztah Jun 6, 2019
9c49308
integration: change container.Create signature to fix linting
thaJeztah Jun 6, 2019
3ade7ca
integration: change container.Run signature to fix linting
thaJeztah Jun 6, 2019
3f4338c
integration: change createAmbiguousNetworks signature to fix linting
thaJeztah Jun 6, 2019
168132b
integration: change testGraphDriver signature to fix linting
thaJeztah Jun 6, 2019
51f390d
integration: get tests to compile again
Jun 12, 2019
0d6d5b3
Revert "Fixing integration test"
thaJeztah Sep 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions integration/build/build_squash_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ func TestBuildSquashParent(t *testing.T) {
resp.Body.Close()
assert.NilError(t, err)

cid := container.Run(t, ctx, client,
cid := container.Run(ctx, t, client,
container.WithImage(name),
container.WithCmd("/bin/sh", "-c", "cat /hello"),
)
Expand All@@ -94,11 +94,11 @@ func TestBuildSquashParent(t *testing.T) {
assert.NilError(t, err)
assert.Check(t, is.Equal(strings.TrimSpace(actualStdout.String()), "hello\nworld"))

container.Run(t, ctx, client,
container.Run(ctx, t, client,
container.WithImage(name),
container.WithCmd("/bin/sh", "-c", "[ ! -f /remove_me ]"),
)
container.Run(t, ctx, client,
container.Run(ctx, t, client,
container.WithImage(name),
container.WithCmd("/bin/sh", "-c", `[ "$(echo $HELLO)" == "world" ]`),
)
Expand Down
2 changes: 1 addition & 1 deletion integration/container/checkpoint_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ func TestCheckpoint(t *testing.T) {
}

t.Log("Start a container")
cID := container.Run(t, ctx, client, container.WithMount(mnt))
cID := container.Run(ctx, t, client, container.WithMount(mnt))
poll.WaitOn(t,
container.IsInState(ctx, client, cID, "running"),
poll.WithDelay(100*time.Millisecond),
Expand Down
10 changes: 5 additions & 5 deletions integration/container/copy_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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))
Expand All@@ -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"))
Expand All@@ -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))
Expand All@@ -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"))
Expand DownExpand Up@@ -105,7 +105,7 @@ func TestCopyFromContainer(t *testing.T) {
assert.NilError(t, err)
assert.Assert(t, imageID != "")

cid := container.Create(t, ctx, apiClient, container.WithImage(imageID))
cid := container.Create(ctx, t, apiClient, container.WithImage(imageID))

for _, x := range []struct {
src string
Expand Down
6 changes: 3 additions & 3 deletions integration/container/daemon_linux_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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{})
Expand DownExpand Up@@ -94,7 +94,7 @@ func TestDaemonRestartIpcMode(t *testing.T) {
ctx := context.Background()

// check the container is created with private ipc mode as per daemon default
cID := container.Run(t, ctx, c,
cID := container.Run(ctx, t, c,
container.WithCmd("top"),
container.WithRestartPolicy("always"),
)
Expand All@@ -113,7 +113,7 @@ func TestDaemonRestartIpcMode(t *testing.T) {
assert.Check(t, is.Equal(string(inspect.HostConfig.IpcMode), "private"))

// check a new container is created with shareable ipc mode as per new daemon default
cID = container.Run(t, ctx, c)
cID = container.Run(ctx, t, c)
defer c.ContainerRemove(ctx, cID, types.ContainerRemoveOptions{Force: true})

inspect, err = c.ContainerInspect(ctx, cID)
Expand Down
2 changes: 1 addition & 1 deletion integration/container/diff_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ func TestDiff(t *testing.T) {
client := testEnv.APIClient()
ctx := context.Background()

cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", `mkdir /foo; echo xyzzy > /foo/bar`))
cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", `mkdir /foo; echo xyzzy > /foo/bar`))

// Wait for it to exit as cannot diff a running container on Windows, and
// it will take a few seconds to exit. Also there's no way in Windows to
Expand Down
6 changes: 3 additions & 3 deletions integration/container/exec_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestExecWithCloseStdin(t *testing.T) {
client := testEnv.APIClient()

// run top with detached mode
cID := container.Run(t, ctx, client)
cID := container.Run(ctx, t, client)

expected := "closeIO"
execResp, err := client.ContainerExecCreate(ctx, cID,
Expand DownExpand Up@@ -90,7 +90,7 @@ func TestExec(t *testing.T) {
ctx := context.Background()
client := testEnv.APIClient()

cID := container.Run(t, ctx, client, container.WithTty(true), container.WithWorkingDir("/root"))
cID := container.Run(ctx, t, client, container.WithTty(true), container.WithWorkingDir("/root"))

id, err := client.ContainerExecCreate(ctx, cID,
types.ExecConfig{
Expand DownExpand Up@@ -125,7 +125,7 @@ func TestExecUser(t *testing.T) {
ctx := context.Background()
client := testEnv.APIClient()

cID := container.Run(t, ctx, client, container.WithTty(true), container.WithUser("1:1"))
cID := container.Run(ctx, t, client, container.WithTty(true), container.WithUser("1:1"))

result, err := container.Exec(ctx, client, cID, []string{"id"})
assert.NilError(t, err)
Expand Down
4 changes: 2 additions & 2 deletions integration/container/export_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ func TestExportContainerAndImportImage(t *testing.T) {
client := testEnv.APIClient()
ctx := context.Background()

cID := container.Run(t, ctx, client, container.WithCmd("true"))
cID := container.Run(ctx, t, client, container.WithCmd("true"))
poll.WaitOn(t, container.IsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond))

reference := "repo/testexp:v1"
Expand DownExpand Up@@ -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)

Expand Down
4 changes: 2 additions & 2 deletions integration/container/health_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ func TestHealthCheckWorkdir(t *testing.T) {
ctx := context.Background()
client := testEnv.APIClient()

cID := container.Run(t, ctx, client, container.WithTty(true), container.WithWorkingDir("/foo"), func(c *container.TestContainerConfig) {
cID := container.Run(ctx, t, client, container.WithTty(true), container.WithWorkingDir("/foo"), func(c *container.TestContainerConfig) {
c.Config.Healthcheck = &containertypes.HealthConfig{
Test: []string{"CMD-SHELL", "if [ \"$PWD\" = \"/foo\" ]; then exit 0; else exit 1; fi;"},
Interval: 50 * time.Millisecond,
Expand All@@ -42,7 +42,7 @@ func TestHealthKillContainer(t *testing.T) {
ctx := context.Background()
client := testEnv.APIClient()

id := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
id := container.Run(ctx, t, client, func(c *container.TestContainerConfig) {
c.Config.Healthcheck = &containertypes.HealthConfig{
Test: []string{"CMD-SHELL", "sleep 1"},
Interval: time.Second,
Expand Down
2 changes: 1 addition & 1 deletion integration/container/inspect_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestInspectCpusetInConfigPre120(t *testing.T) {

name := "cpusetinconfig-pre120-" + t.Name()
// Create container with up to-date-API
container.Run(t, ctx, request.NewAPIClient(t), container.WithName(name),
container.Run(ctx, t, request.NewAPIClient(t), container.WithName(name),
container.WithCmd("true"),
func(c *container.TestContainerConfig) {
c.HostConfig.Resources.CpusetCpus = "0"
Expand Down
4 changes: 2 additions & 2 deletions integration/container/ipcmode_linux_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -308,15 +308,15 @@ 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)
assert.Check(t, is.Equal(string(inspect.HostConfig.IpcMode), "private"))

// 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)
Expand Down
16 changes: 8 additions & 8 deletions integration/container/kill_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ func TestKillContainerInvalidSignal(t *testing.T) {
defer setupTest(t)()
client := testEnv.APIClient()
ctx := context.Background()
id := container.Run(t, ctx, client)
id := container.Run(ctx, t, client)

err := client.ContainerKill(ctx, id, "0")
assert.Error(t, err, "Error response from daemon: Invalid signal: 0")
Expand DownExpand Up@@ -60,7 +60,7 @@ func TestKillContainer(t *testing.T) {
tc := tc
t.Run(tc.doc, func(t *testing.T) {
ctx := context.Background()
id := container.Run(t, ctx, client)
id := container.Run(ctx, t, client)
err := client.ContainerKill(ctx, id, tc.signal)
assert.NilError(t, err)

Expand DownExpand Up@@ -95,7 +95,7 @@ func TestKillWithStopSignalAndRestartPolicies(t *testing.T) {
tc := tc
t.Run(tc.doc, func(t *testing.T) {
ctx := context.Background()
id := container.Run(t, ctx, client,
id := container.Run(ctx, t, client,
container.WithRestartPolicy("always"),
func(c *container.TestContainerConfig) {
c.Config.StopSignal = tc.stopsignal
Expand All@@ -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"))
Expand All@@ -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)
}
Expand All@@ -137,7 +137,7 @@ func TestKillDifferentUserContainer(t *testing.T) {
ctx := context.Background()
client := request.NewAPIClient(t, client.WithVersion("1.19"))

id := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
id := container.Run(ctx, t, client, func(c *container.TestContainerConfig) {
c.Config.User = "daemon"
})
poll.WaitOn(t, container.IsInState(ctx, client, id, "running"), poll.WithDelay(100*time.Millisecond))
Expand All@@ -154,7 +154,7 @@ func TestInspectOomKilledTrue(t *testing.T) {
ctx := context.Background()
client := testEnv.APIClient()

cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", "x=a; while true; do x=$x$x$x$x; done"), func(c *container.TestContainerConfig) {
cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", "x=a; while true; do x=$x$x$x$x; done"), func(c *container.TestContainerConfig) {
c.HostConfig.Resources.Memory = 32 * 1024 * 1024
})

Expand All@@ -172,7 +172,7 @@ func TestInspectOomKilledFalse(t *testing.T) {
ctx := context.Background()
client := testEnv.APIClient()

cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", "echo hello world"))
cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", "echo hello world"))

poll.WaitOn(t, container.IsInState(ctx, client, cID, "exited"), poll.WithDelay(100*time.Millisecond))

Expand Down
6 changes: 3 additions & 3 deletions integration/container/links_linux_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestLinksEtcHostsContentMatch(t *testing.T) {
client := testEnv.APIClient()
ctx := context.Background()

cID := container.Run(t, ctx, client, container.WithNetworkMode("host"))
cID := container.Run(ctx, t, client, container.WithNetworkMode("host"))
res, err := container.Exec(ctx, client, cID, []string{"cat", "/etc/hosts"})
assert.NilError(t, err)
assert.Assert(t, is.Len(res.Stderr(), 0))
Expand All@@ -42,8 +42,8 @@ func TestLinksContainerNames(t *testing.T) {

containerA := "first_" + t.Name()
containerB := "second_" + t.Name()
container.Run(t, ctx, client, container.WithName(containerA))
container.Run(t, ctx, client, container.WithName(containerB), container.WithLinks(containerA+":"+containerA))
container.Run(ctx, t, client, container.WithName(containerA))
container.Run(ctx, t, client, container.WithName(containerB), container.WithLinks(containerA+":"+containerA))

f := filters.NewArgs(filters.Arg("name", containerA))

Expand Down
2 changes: 1 addition & 1 deletion integration/container/logs_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ func TestLogsFollowTailEmpty(t *testing.T) {
client := testEnv.APIClient()
ctx := context.Background()

id := container.Run(t, ctx, client, container.WithCmd("sleep", "100000"))
id := container.Run(ctx, t, client, container.WithCmd("sleep", "100000"))

logs, err := client.ContainerLogs(ctx, id, types.ContainerLogsOptions{ShowStdout: true, Tail: "2"})
if logs != nil {
Expand Down
6 changes: 3 additions & 3 deletions integration/container/mounts_linux_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -256,9 +256,9 @@ func TestContainerBindMountNonRecursive(t *testing.T) {
ctx := context.Background()
client := testEnv.APIClient()
containers := []string{
container.Run(t, ctx, client, container.WithMount(implicit), container.WithCmd(recursiveVerifier...)),
container.Run(t, ctx, client, container.WithMount(recursive), container.WithCmd(recursiveVerifier...)),
container.Run(t, ctx, client, container.WithMount(nonRecursive), container.WithCmd(nonRecursiveVerifier...)),
container.Run(ctx, t, client, container.WithMount(implicit), container.WithCmd(recursiveVerifier...)),
container.Run(ctx, t, client, container.WithMount(recursive), container.WithCmd(recursiveVerifier...)),
container.Run(ctx, t, client, container.WithMount(nonRecursive), container.WithCmd(nonRecursiveVerifier...)),
}

for _, c := range containers {
Expand Down
4 changes: 2 additions & 2 deletions integration/container/nat_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ func TestNetworkLoopbackNat(t *testing.T) {
client := testEnv.APIClient()
ctx := context.Background()

cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String())), container.WithTty(true), container.WithNetworkMode("container:"+serverContainerID))
cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String())), container.WithTty(true), container.WithNetworkMode("container:"+serverContainerID))

poll.WaitOn(t, container.IsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond))

Expand All@@ -93,7 +93,7 @@ func startServerContainer(t *testing.T, msg string, port int) string {
client := testEnv.APIClient()
ctx := context.Background()

cID := container.Run(t, ctx, client, container.WithName("server-"+t.Name()), container.WithCmd("sh", "-c", fmt.Sprintf("echo %q | nc -lp %d", msg, port)), container.WithExposedPorts(fmt.Sprintf("%d/tcp", port)), func(c *container.TestContainerConfig) {
cID := container.Run(ctx, t, client, container.WithName("server-"+t.Name()), container.WithCmd("sh", "-c", fmt.Sprintf("echo %q | nc -lp %d", msg, port)), container.WithExposedPorts(fmt.Sprintf("%d/tcp", port)), func(c *container.TestContainerConfig) {
c.HostConfig.PortBindings = nat.PortMap{
nat.Port(fmt.Sprintf("%d/tcp", port)): []nat.PortBinding{
{
Expand Down
6 changes: 3 additions & 3 deletions integration/container/pause_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ func TestPause(t *testing.T) {
client := testEnv.APIClient()
ctx := context.Background()

cID := container.Run(t, ctx, client)
cID := container.Run(ctx, t, client)
poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

since := request.DaemonUnixTime(ctx, t, client, testEnv)
Expand DownExpand Up@@ -57,7 +57,7 @@ func TestPauseFailsOnWindowsServerContainers(t *testing.T) {
client := testEnv.APIClient()
ctx := context.Background()

cID := container.Run(t, ctx, client)
cID := container.Run(ctx, t, client)
poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

err := client.ContainerPause(ctx, cID)
Expand All@@ -71,7 +71,7 @@ func TestPauseStopPausedContainer(t *testing.T) {
client := testEnv.APIClient()
ctx := context.Background()

cID := container.Run(t, ctx, client)
cID := container.Run(ctx, t, client)
poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

err := client.ContainerPause(ctx, cID)
Expand Down
6 changes: 3 additions & 3 deletions integration/container/ps_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content

This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[19.03 backport] Integration: change signatures to fix golint warnings#281
 Merged

andrewhsu
merged 8 commits into

from

Sep 23, 2019
 Merged


[19.03 backport] Integration: change signatures to fix golint warnings
#281
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
235fa0e

Revert "integration: have container.Create call compile"


thaJeztah Aug 13, 2019
9175772

integration: change network.CreateNoError signature to fix linting


thaJeztah Jun 6, 2019
9c49308

integration: change container.Create signature to fix linting


thaJeztah Jun 6, 2019
3ade7ca

integration: change container.Run signature to fix linting


thaJeztah Jun 6, 2019
3f4338c

integration: change createAmbiguousNetworks signature to fix linting


thaJeztah Jun 6, 2019
168132b

integration: change testGraphDriver signature to fix linting


thaJeztah Jun 6, 2019
51f390d

integration: get tests to compile again

Jun 12, 2019
0d6d5b3

Revert "Fixing integration test"


thaJeztah Sep 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
integration/build/build_squash_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ func TestBuildSquashParent(t *testing.T) {
	resp.Body.Close()
	assert.NilError(t, err)

	cid := container.Run(t, ctx, client,
	cid := container.Run(ctx, t, client,
 container.WithImage(name),
 container.WithCmd("/bin/sh", "-c", "cat /hello"),
	)
Expand All@@ -94,11 +94,11 @@ func TestBuildSquashParent(t *testing.T) {
	assert.NilError(t, err)
	assert.Check(t, is.Equal(strings.TrimSpace(actualStdout.String()), "hello\nworld"))

	container.Run(t, ctx, client,
	container.Run(ctx, t, client,
 container.WithImage(name),
 container.WithCmd("/bin/sh", "-c", "[ ! -f /remove_me ]"),
	)
	container.Run(t, ctx, client,
	container.Run(ctx, t, client,
 container.WithImage(name),
 container.WithCmd("/bin/sh", "-c", `[ "$(echo $HELLO)" == "world" ]`),
	)
Expand Down

2 changes: 1 addition & 1 deletion
integration/container/checkpoint_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ func TestCheckpoint(t *testing.T) {
	}

	t.Log("Start a container")
	cID := container.Run(t, ctx, client, container.WithMount(mnt))
	cID := container.Run(ctx, t, client, container.WithMount(mnt))
	poll.WaitOn(t,
 container.IsInState(ctx, client, cID, "running"),
 poll.WithDelay(100*time.Millisecond),
Expand Down

10 changes: 5 additions & 5 deletions
integration/container/copy_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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))
Expand All@@ -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"))
Expand All@@ -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))
Expand All@@ -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"))
Expand DownExpand Up@@ -105,7 +105,7 @@ func TestCopyFromContainer(t *testing.T) {
	assert.NilError(t, err)
	assert.Assert(t, imageID != "")

	cid := container.Create(t, ctx, apiClient, container.WithImage(imageID))
	cid := container.Create(ctx, t, apiClient, container.WithImage(imageID))

	for _, x := range []struct {
 src string
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/daemon_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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{})
Expand DownExpand Up@@ -94,7 +94,7 @@ func TestDaemonRestartIpcMode(t *testing.T) {
	ctx := context.Background()

	// check the container is created with private ipc mode as per daemon default
	cID := container.Run(t, ctx, c,
	cID := container.Run(ctx, t, c,
 container.WithCmd("top"),
 container.WithRestartPolicy("always"),
	)
Expand All@@ -113,7 +113,7 @@ func TestDaemonRestartIpcMode(t *testing.T) {
	assert.Check(t, is.Equal(string(inspect.HostConfig.IpcMode), "private"))

	// check a new container is created with shareable ipc mode as per new daemon default
	cID = container.Run(t, ctx, c)
	cID = container.Run(ctx, t, c)
	defer c.ContainerRemove(ctx, cID, types.ContainerRemoveOptions{Force: true})

	inspect, err = c.ContainerInspect(ctx, cID)
Expand Down

2 changes: 1 addition & 1 deletion
integration/container/diff_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ func TestDiff(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", `mkdir /foo; echo xyzzy > /foo/bar`))
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", `mkdir /foo; echo xyzzy > /foo/bar`))

	// Wait for it to exit as cannot diff a running container on Windows, and
	// it will take a few seconds to exit. Also there's no way in Windows to
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/exec_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestExecWithCloseStdin(t *testing.T) {
	client := testEnv.APIClient()

	// run top with detached mode
	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)

	expected := "closeIO"
	execResp, err := client.ContainerExecCreate(ctx, cID,
Expand DownExpand Up@@ -90,7 +90,7 @@ func TestExec(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithTty(true), container.WithWorkingDir("/root"))
	cID := container.Run(ctx, t, client, container.WithTty(true), container.WithWorkingDir("/root"))

	id, err := client.ContainerExecCreate(ctx, cID,
 types.ExecConfig{
Expand DownExpand Up@@ -125,7 +125,7 @@ func TestExecUser(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithTty(true), container.WithUser("1:1"))
	cID := container.Run(ctx, t, client, container.WithTty(true), container.WithUser("1:1"))

	result, err := container.Exec(ctx, client, cID, []string{"id"})
	assert.NilError(t, err)
Expand Down

4 changes: 2 additions & 2 deletions
integration/container/export_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ func TestExportContainerAndImportImage(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithCmd("true"))
	cID := container.Run(ctx, t, client, container.WithCmd("true"))
	poll.WaitOn(t, container.IsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond))

	reference := "repo/testexp:v1"
Expand DownExpand Up@@ -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)

Expand Down

4 changes: 2 additions & 2 deletions
integration/container/health_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ func TestHealthCheckWorkdir(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithTty(true), container.WithWorkingDir("/foo"), func(c *container.TestContainerConfig) {
	cID := container.Run(ctx, t, client, container.WithTty(true), container.WithWorkingDir("/foo"), func(c *container.TestContainerConfig) {
 c.Config.Healthcheck = &containertypes.HealthConfig{
 Test: []string{"CMD-SHELL", "if [ \"$PWD\" = \"/foo\" ]; then exit 0; else exit 1; fi;"},
 Interval: 50 * time.Millisecond,
Expand All@@ -42,7 +42,7 @@ func TestHealthKillContainer(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	id := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
	id := container.Run(ctx, t, client, func(c *container.TestContainerConfig) {
 c.Config.Healthcheck = &containertypes.HealthConfig{
 Test: []string{"CMD-SHELL", "sleep 1"},
 Interval: time.Second,
Expand Down

2 changes: 1 addition & 1 deletion
integration/container/inspect_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestInspectCpusetInConfigPre120(t *testing.T) {

	name := "cpusetinconfig-pre120-" + t.Name()
	// Create container with up to-date-API
	container.Run(t, ctx, request.NewAPIClient(t), container.WithName(name),
	container.Run(ctx, t, request.NewAPIClient(t), container.WithName(name),
 container.WithCmd("true"),
 func(c *container.TestContainerConfig) {
 c.HostConfig.Resources.CpusetCpus = "0"
Expand Down

4 changes: 2 additions & 2 deletions
integration/container/ipcmode_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -308,15 +308,15 @@ 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)
	assert.Check(t, is.Equal(string(inspect.HostConfig.IpcMode), "private"))

	// 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)
Expand Down

16 changes: 8 additions & 8 deletions
integration/container/kill_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ func TestKillContainerInvalidSignal(t *testing.T) {
	defer setupTest(t)()
	client := testEnv.APIClient()
	ctx := context.Background()
	id := container.Run(t, ctx, client)
	id := container.Run(ctx, t, client)

	err := client.ContainerKill(ctx, id, "0")
	assert.Error(t, err, "Error response from daemon: Invalid signal: 0")
Expand DownExpand Up@@ -60,7 +60,7 @@ func TestKillContainer(t *testing.T) {
 tc := tc
 t.Run(tc.doc, func(t *testing.T) {
 ctx := context.Background()
 id := container.Run(t, ctx, client)
 id := container.Run(ctx, t, client)
 err := client.ContainerKill(ctx, id, tc.signal)
 assert.NilError(t, err)

Expand DownExpand Up@@ -95,7 +95,7 @@ func TestKillWithStopSignalAndRestartPolicies(t *testing.T) {
 tc := tc
 t.Run(tc.doc, func(t *testing.T) {
 ctx := context.Background()
 id := container.Run(t, ctx, client,
 id := container.Run(ctx, t, client,
 container.WithRestartPolicy("always"),
 func(c *container.TestContainerConfig) {
 c.Config.StopSignal = tc.stopsignal
Expand All@@ -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"))
Expand All@@ -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)
}
Expand All@@ -137,7 +137,7 @@ func TestKillDifferentUserContainer(t *testing.T) {
	ctx := context.Background()
	client := request.NewAPIClient(t, client.WithVersion("1.19"))

	id := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
	id := container.Run(ctx, t, client, func(c *container.TestContainerConfig) {
 c.Config.User = "daemon"
	})
	poll.WaitOn(t, container.IsInState(ctx, client, id, "running"), poll.WithDelay(100*time.Millisecond))
Expand All@@ -154,7 +154,7 @@ func TestInspectOomKilledTrue(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", "x=a; while true; do x=$x$x$x$x; done"), func(c *container.TestContainerConfig) {
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", "x=a; while true; do x=$x$x$x$x; done"), func(c *container.TestContainerConfig) {
 c.HostConfig.Resources.Memory = 32 * 1024 * 1024
	})

Expand All@@ -172,7 +172,7 @@ func TestInspectOomKilledFalse(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", "echo hello world"))
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", "echo hello world"))

	poll.WaitOn(t, container.IsInState(ctx, client, cID, "exited"), poll.WithDelay(100*time.Millisecond))

Expand Down

6 changes: 3 additions & 3 deletions
integration/container/links_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestLinksEtcHostsContentMatch(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithNetworkMode("host"))
	cID := container.Run(ctx, t, client, container.WithNetworkMode("host"))
	res, err := container.Exec(ctx, client, cID, []string{"cat", "/etc/hosts"})
	assert.NilError(t, err)
	assert.Assert(t, is.Len(res.Stderr(), 0))
Expand All@@ -42,8 +42,8 @@ func TestLinksContainerNames(t *testing.T) {

	containerA := "first_" + t.Name()
	containerB := "second_" + t.Name()
	container.Run(t, ctx, client, container.WithName(containerA))
	container.Run(t, ctx, client, container.WithName(containerB), container.WithLinks(containerA+":"+containerA))
	container.Run(ctx, t, client, container.WithName(containerA))
	container.Run(ctx, t, client, container.WithName(containerB), container.WithLinks(containerA+":"+containerA))

	f := filters.NewArgs(filters.Arg("name", containerA))

Expand Down

2 changes: 1 addition & 1 deletion
integration/container/logs_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ func TestLogsFollowTailEmpty(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	id := container.Run(t, ctx, client, container.WithCmd("sleep", "100000"))
	id := container.Run(ctx, t, client, container.WithCmd("sleep", "100000"))

	logs, err := client.ContainerLogs(ctx, id, types.ContainerLogsOptions{ShowStdout: true, Tail: "2"})
	if logs != nil {
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/mounts_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -256,9 +256,9 @@ func TestContainerBindMountNonRecursive(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()
	containers := []string{
 container.Run(t, ctx, client, container.WithMount(implicit), container.WithCmd(recursiveVerifier...)),
 container.Run(t, ctx, client, container.WithMount(recursive), container.WithCmd(recursiveVerifier...)),
 container.Run(t, ctx, client, container.WithMount(nonRecursive), container.WithCmd(nonRecursiveVerifier...)),
 container.Run(ctx, t, client, container.WithMount(implicit), container.WithCmd(recursiveVerifier...)),
 container.Run(ctx, t, client, container.WithMount(recursive), container.WithCmd(recursiveVerifier...)),
 container.Run(ctx, t, client, container.WithMount(nonRecursive), container.WithCmd(nonRecursiveVerifier...)),
	}

	for _, c := range containers {
Expand Down

4 changes: 2 additions & 2 deletions
integration/container/nat_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ func TestNetworkLoopbackNat(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String())), container.WithTty(true), container.WithNetworkMode("container:"+serverContainerID))
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String())), container.WithTty(true), container.WithNetworkMode("container:"+serverContainerID))

	poll.WaitOn(t, container.IsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond))

Expand All@@ -93,7 +93,7 @@ func startServerContainer(t *testing.T, msg string, port int) string {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithName("server-"+t.Name()), container.WithCmd("sh", "-c", fmt.Sprintf("echo %q | nc -lp %d", msg, port)), container.WithExposedPorts(fmt.Sprintf("%d/tcp", port)), func(c *container.TestContainerConfig) {
	cID := container.Run(ctx, t, client, container.WithName("server-"+t.Name()), container.WithCmd("sh", "-c", fmt.Sprintf("echo %q | nc -lp %d", msg, port)), container.WithExposedPorts(fmt.Sprintf("%d/tcp", port)), func(c *container.TestContainerConfig) {
 c.HostConfig.PortBindings = nat.PortMap{
 nat.Port(fmt.Sprintf("%d/tcp", port)): []nat.PortBinding{
 {
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/pause_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ func TestPause(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)
	poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

	since := request.DaemonUnixTime(ctx, t, client, testEnv)
Expand DownExpand Up@@ -57,7 +57,7 @@ func TestPauseFailsOnWindowsServerContainers(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)
	poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

	err := client.ContainerPause(ctx, cID)
Expand All@@ -71,7 +71,7 @@ func TestPauseStopPausedContainer(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)
	poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

	err := client.ContainerPause(ctx, cID)
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/ps_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[19.03 backport] Integration: change signatures to fix golint warnings#281
 Merged

andrewhsu
merged 8 commits into

from

Sep 23, 2019
 Merged


[19.03 backport] Integration: change signatures to fix golint warnings
#281
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
235fa0e

Revert "integration: have container.Create call compile"


thaJeztah Aug 13, 2019
9175772

integration: change network.CreateNoError signature to fix linting


thaJeztah Jun 6, 2019
9c49308

integration: change container.Create signature to fix linting


thaJeztah Jun 6, 2019
3ade7ca

integration: change container.Run signature to fix linting


thaJeztah Jun 6, 2019
3f4338c

integration: change createAmbiguousNetworks signature to fix linting


thaJeztah Jun 6, 2019
168132b

integration: change testGraphDriver signature to fix linting


thaJeztah Jun 6, 2019
51f390d

integration: get tests to compile again

Jun 12, 2019
0d6d5b3

Revert "Fixing integration test"


thaJeztah Sep 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
integration/build/build_squash_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ func TestBuildSquashParent(t *testing.T) {
	resp.Body.Close()
	assert.NilError(t, err)

	cid := container.Run(t, ctx, client,
	cid := container.Run(ctx, t, client,
 container.WithImage(name),
 container.WithCmd("/bin/sh", "-c", "cat /hello"),
	)
Expand All@@ -94,11 +94,11 @@ func TestBuildSquashParent(t *testing.T) {
	assert.NilError(t, err)
	assert.Check(t, is.Equal(strings.TrimSpace(actualStdout.String()), "hello\nworld"))

	container.Run(t, ctx, client,
	container.Run(ctx, t, client,
 container.WithImage(name),
 container.WithCmd("/bin/sh", "-c", "[ ! -f /remove_me ]"),
	)
	container.Run(t, ctx, client,
	container.Run(ctx, t, client,
 container.WithImage(name),
 container.WithCmd("/bin/sh", "-c", `[ "$(echo $HELLO)" == "world" ]`),
	)
Expand Down

2 changes: 1 addition & 1 deletion
integration/container/checkpoint_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ func TestCheckpoint(t *testing.T) {
	}

	t.Log("Start a container")
	cID := container.Run(t, ctx, client, container.WithMount(mnt))
	cID := container.Run(ctx, t, client, container.WithMount(mnt))
	poll.WaitOn(t,
 container.IsInState(ctx, client, cID, "running"),
 poll.WithDelay(100*time.Millisecond),
Expand Down

10 changes: 5 additions & 5 deletions
integration/container/copy_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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))
Expand All@@ -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"))
Expand All@@ -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))
Expand All@@ -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"))
Expand DownExpand Up@@ -105,7 +105,7 @@ func TestCopyFromContainer(t *testing.T) {
	assert.NilError(t, err)
	assert.Assert(t, imageID != "")

	cid := container.Create(t, ctx, apiClient, container.WithImage(imageID))
	cid := container.Create(ctx, t, apiClient, container.WithImage(imageID))

	for _, x := range []struct {
 src string
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/daemon_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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{})
Expand DownExpand Up@@ -94,7 +94,7 @@ func TestDaemonRestartIpcMode(t *testing.T) {
	ctx := context.Background()

	// check the container is created with private ipc mode as per daemon default
	cID := container.Run(t, ctx, c,
	cID := container.Run(ctx, t, c,
 container.WithCmd("top"),
 container.WithRestartPolicy("always"),
	)
Expand All@@ -113,7 +113,7 @@ func TestDaemonRestartIpcMode(t *testing.T) {
	assert.Check(t, is.Equal(string(inspect.HostConfig.IpcMode), "private"))

	// check a new container is created with shareable ipc mode as per new daemon default
	cID = container.Run(t, ctx, c)
	cID = container.Run(ctx, t, c)
	defer c.ContainerRemove(ctx, cID, types.ContainerRemoveOptions{Force: true})

	inspect, err = c.ContainerInspect(ctx, cID)
Expand Down

2 changes: 1 addition & 1 deletion
integration/container/diff_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ func TestDiff(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", `mkdir /foo; echo xyzzy > /foo/bar`))
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", `mkdir /foo; echo xyzzy > /foo/bar`))

	// Wait for it to exit as cannot diff a running container on Windows, and
	// it will take a few seconds to exit. Also there's no way in Windows to
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/exec_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestExecWithCloseStdin(t *testing.T) {
	client := testEnv.APIClient()

	// run top with detached mode
	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)

	expected := "closeIO"
	execResp, err := client.ContainerExecCreate(ctx, cID,
Expand DownExpand Up@@ -90,7 +90,7 @@ func TestExec(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithTty(true), container.WithWorkingDir("/root"))
	cID := container.Run(ctx, t, client, container.WithTty(true), container.WithWorkingDir("/root"))

	id, err := client.ContainerExecCreate(ctx, cID,
 types.ExecConfig{
Expand DownExpand Up@@ -125,7 +125,7 @@ func TestExecUser(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithTty(true), container.WithUser("1:1"))
	cID := container.Run(ctx, t, client, container.WithTty(true), container.WithUser("1:1"))

	result, err := container.Exec(ctx, client, cID, []string{"id"})
	assert.NilError(t, err)
Expand Down

4 changes: 2 additions & 2 deletions
integration/container/export_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ func TestExportContainerAndImportImage(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithCmd("true"))
	cID := container.Run(ctx, t, client, container.WithCmd("true"))
	poll.WaitOn(t, container.IsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond))

	reference := "repo/testexp:v1"
Expand DownExpand Up@@ -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)

Expand Down

4 changes: 2 additions & 2 deletions
integration/container/health_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ func TestHealthCheckWorkdir(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithTty(true), container.WithWorkingDir("/foo"), func(c *container.TestContainerConfig) {
	cID := container.Run(ctx, t, client, container.WithTty(true), container.WithWorkingDir("/foo"), func(c *container.TestContainerConfig) {
 c.Config.Healthcheck = &containertypes.HealthConfig{
 Test: []string{"CMD-SHELL", "if [ \"$PWD\" = \"/foo\" ]; then exit 0; else exit 1; fi;"},
 Interval: 50 * time.Millisecond,
Expand All@@ -42,7 +42,7 @@ func TestHealthKillContainer(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	id := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
	id := container.Run(ctx, t, client, func(c *container.TestContainerConfig) {
 c.Config.Healthcheck = &containertypes.HealthConfig{
 Test: []string{"CMD-SHELL", "sleep 1"},
 Interval: time.Second,
Expand Down

2 changes: 1 addition & 1 deletion
integration/container/inspect_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestInspectCpusetInConfigPre120(t *testing.T) {

	name := "cpusetinconfig-pre120-" + t.Name()
	// Create container with up to-date-API
	container.Run(t, ctx, request.NewAPIClient(t), container.WithName(name),
	container.Run(ctx, t, request.NewAPIClient(t), container.WithName(name),
 container.WithCmd("true"),
 func(c *container.TestContainerConfig) {
 c.HostConfig.Resources.CpusetCpus = "0"
Expand Down

4 changes: 2 additions & 2 deletions
integration/container/ipcmode_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -308,15 +308,15 @@ 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)
	assert.Check(t, is.Equal(string(inspect.HostConfig.IpcMode), "private"))

	// 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)
Expand Down

16 changes: 8 additions & 8 deletions
integration/container/kill_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ func TestKillContainerInvalidSignal(t *testing.T) {
	defer setupTest(t)()
	client := testEnv.APIClient()
	ctx := context.Background()
	id := container.Run(t, ctx, client)
	id := container.Run(ctx, t, client)

	err := client.ContainerKill(ctx, id, "0")
	assert.Error(t, err, "Error response from daemon: Invalid signal: 0")
Expand DownExpand Up@@ -60,7 +60,7 @@ func TestKillContainer(t *testing.T) {
 tc := tc
 t.Run(tc.doc, func(t *testing.T) {
 ctx := context.Background()
 id := container.Run(t, ctx, client)
 id := container.Run(ctx, t, client)
 err := client.ContainerKill(ctx, id, tc.signal)
 assert.NilError(t, err)

Expand DownExpand Up@@ -95,7 +95,7 @@ func TestKillWithStopSignalAndRestartPolicies(t *testing.T) {
 tc := tc
 t.Run(tc.doc, func(t *testing.T) {
 ctx := context.Background()
 id := container.Run(t, ctx, client,
 id := container.Run(ctx, t, client,
 container.WithRestartPolicy("always"),
 func(c *container.TestContainerConfig) {
 c.Config.StopSignal = tc.stopsignal
Expand All@@ -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"))
Expand All@@ -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)
}
Expand All@@ -137,7 +137,7 @@ func TestKillDifferentUserContainer(t *testing.T) {
	ctx := context.Background()
	client := request.NewAPIClient(t, client.WithVersion("1.19"))

	id := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
	id := container.Run(ctx, t, client, func(c *container.TestContainerConfig) {
 c.Config.User = "daemon"
	})
	poll.WaitOn(t, container.IsInState(ctx, client, id, "running"), poll.WithDelay(100*time.Millisecond))
Expand All@@ -154,7 +154,7 @@ func TestInspectOomKilledTrue(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", "x=a; while true; do x=$x$x$x$x; done"), func(c *container.TestContainerConfig) {
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", "x=a; while true; do x=$x$x$x$x; done"), func(c *container.TestContainerConfig) {
 c.HostConfig.Resources.Memory = 32 * 1024 * 1024
	})

Expand All@@ -172,7 +172,7 @@ func TestInspectOomKilledFalse(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", "echo hello world"))
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", "echo hello world"))

	poll.WaitOn(t, container.IsInState(ctx, client, cID, "exited"), poll.WithDelay(100*time.Millisecond))

Expand Down

6 changes: 3 additions & 3 deletions
integration/container/links_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestLinksEtcHostsContentMatch(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithNetworkMode("host"))
	cID := container.Run(ctx, t, client, container.WithNetworkMode("host"))
	res, err := container.Exec(ctx, client, cID, []string{"cat", "/etc/hosts"})
	assert.NilError(t, err)
	assert.Assert(t, is.Len(res.Stderr(), 0))
Expand All@@ -42,8 +42,8 @@ func TestLinksContainerNames(t *testing.T) {

	containerA := "first_" + t.Name()
	containerB := "second_" + t.Name()
	container.Run(t, ctx, client, container.WithName(containerA))
	container.Run(t, ctx, client, container.WithName(containerB), container.WithLinks(containerA+":"+containerA))
	container.Run(ctx, t, client, container.WithName(containerA))
	container.Run(ctx, t, client, container.WithName(containerB), container.WithLinks(containerA+":"+containerA))

	f := filters.NewArgs(filters.Arg("name", containerA))

Expand Down

2 changes: 1 addition & 1 deletion
integration/container/logs_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ func TestLogsFollowTailEmpty(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	id := container.Run(t, ctx, client, container.WithCmd("sleep", "100000"))
	id := container.Run(ctx, t, client, container.WithCmd("sleep", "100000"))

	logs, err := client.ContainerLogs(ctx, id, types.ContainerLogsOptions{ShowStdout: true, Tail: "2"})
	if logs != nil {
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/mounts_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -256,9 +256,9 @@ func TestContainerBindMountNonRecursive(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()
	containers := []string{
 container.Run(t, ctx, client, container.WithMount(implicit), container.WithCmd(recursiveVerifier...)),
 container.Run(t, ctx, client, container.WithMount(recursive), container.WithCmd(recursiveVerifier...)),
 container.Run(t, ctx, client, container.WithMount(nonRecursive), container.WithCmd(nonRecursiveVerifier...)),
 container.Run(ctx, t, client, container.WithMount(implicit), container.WithCmd(recursiveVerifier...)),
 container.Run(ctx, t, client, container.WithMount(recursive), container.WithCmd(recursiveVerifier...)),
 container.Run(ctx, t, client, container.WithMount(nonRecursive), container.WithCmd(nonRecursiveVerifier...)),
	}

	for _, c := range containers {
Expand Down

4 changes: 2 additions & 2 deletions
integration/container/nat_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ func TestNetworkLoopbackNat(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String())), container.WithTty(true), container.WithNetworkMode("container:"+serverContainerID))
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String())), container.WithTty(true), container.WithNetworkMode("container:"+serverContainerID))

	poll.WaitOn(t, container.IsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond))

Expand All@@ -93,7 +93,7 @@ func startServerContainer(t *testing.T, msg string, port int) string {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithName("server-"+t.Name()), container.WithCmd("sh", "-c", fmt.Sprintf("echo %q | nc -lp %d", msg, port)), container.WithExposedPorts(fmt.Sprintf("%d/tcp", port)), func(c *container.TestContainerConfig) {
	cID := container.Run(ctx, t, client, container.WithName("server-"+t.Name()), container.WithCmd("sh", "-c", fmt.Sprintf("echo %q | nc -lp %d", msg, port)), container.WithExposedPorts(fmt.Sprintf("%d/tcp", port)), func(c *container.TestContainerConfig) {
 c.HostConfig.PortBindings = nat.PortMap{
 nat.Port(fmt.Sprintf("%d/tcp", port)): []nat.PortBinding{
 {
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/pause_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ func TestPause(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)
	poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

	since := request.DaemonUnixTime(ctx, t, client, testEnv)
Expand DownExpand Up@@ -57,7 +57,7 @@ func TestPauseFailsOnWindowsServerContainers(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)
	poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

	err := client.ContainerPause(ctx, cID)
Expand All@@ -71,7 +71,7 @@ func TestPauseStopPausedContainer(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)
	poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

	err := client.ContainerPause(ctx, cID)
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/ps_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[19.03 backport] Integration: change signatures to fix golint warnings#281
 Merged

andrewhsu
merged 8 commits into

from

Sep 23, 2019
 Merged


[19.03 backport] Integration: change signatures to fix golint warnings
#281
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
235fa0e

Revert "integration: have container.Create call compile"


thaJeztah Aug 13, 2019
9175772

integration: change network.CreateNoError signature to fix linting


thaJeztah Jun 6, 2019
9c49308

integration: change container.Create signature to fix linting


thaJeztah Jun 6, 2019
3ade7ca

integration: change container.Run signature to fix linting


thaJeztah Jun 6, 2019
3f4338c

integration: change createAmbiguousNetworks signature to fix linting


thaJeztah Jun 6, 2019
168132b

integration: change testGraphDriver signature to fix linting


thaJeztah Jun 6, 2019
51f390d

integration: get tests to compile again

Jun 12, 2019
0d6d5b3

Revert "Fixing integration test"


thaJeztah Sep 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
integration/build/build_squash_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ func TestBuildSquashParent(t *testing.T) {
	resp.Body.Close()
	assert.NilError(t, err)

	cid := container.Run(t, ctx, client,
	cid := container.Run(ctx, t, client,
 container.WithImage(name),
 container.WithCmd("/bin/sh", "-c", "cat /hello"),
	)
Expand All@@ -94,11 +94,11 @@ func TestBuildSquashParent(t *testing.T) {
	assert.NilError(t, err)
	assert.Check(t, is.Equal(strings.TrimSpace(actualStdout.String()), "hello\nworld"))

	container.Run(t, ctx, client,
	container.Run(ctx, t, client,
 container.WithImage(name),
 container.WithCmd("/bin/sh", "-c", "[ ! -f /remove_me ]"),
	)
	container.Run(t, ctx, client,
	container.Run(ctx, t, client,
 container.WithImage(name),
 container.WithCmd("/bin/sh", "-c", `[ "$(echo $HELLO)" == "world" ]`),
	)
Expand Down

2 changes: 1 addition & 1 deletion
integration/container/checkpoint_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ func TestCheckpoint(t *testing.T) {
	}

	t.Log("Start a container")
	cID := container.Run(t, ctx, client, container.WithMount(mnt))
	cID := container.Run(ctx, t, client, container.WithMount(mnt))
	poll.WaitOn(t,
 container.IsInState(ctx, client, cID, "running"),
 poll.WithDelay(100*time.Millisecond),
Expand Down

10 changes: 5 additions & 5 deletions
integration/container/copy_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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))
Expand All@@ -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"))
Expand All@@ -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))
Expand All@@ -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"))
Expand DownExpand Up@@ -105,7 +105,7 @@ func TestCopyFromContainer(t *testing.T) {
	assert.NilError(t, err)
	assert.Assert(t, imageID != "")

	cid := container.Create(t, ctx, apiClient, container.WithImage(imageID))
	cid := container.Create(ctx, t, apiClient, container.WithImage(imageID))

	for _, x := range []struct {
 src string
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/daemon_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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{})
Expand DownExpand Up@@ -94,7 +94,7 @@ func TestDaemonRestartIpcMode(t *testing.T) {
	ctx := context.Background()

	// check the container is created with private ipc mode as per daemon default
	cID := container.Run(t, ctx, c,
	cID := container.Run(ctx, t, c,
 container.WithCmd("top"),
 container.WithRestartPolicy("always"),
	)
Expand All@@ -113,7 +113,7 @@ func TestDaemonRestartIpcMode(t *testing.T) {
	assert.Check(t, is.Equal(string(inspect.HostConfig.IpcMode), "private"))

	// check a new container is created with shareable ipc mode as per new daemon default
	cID = container.Run(t, ctx, c)
	cID = container.Run(ctx, t, c)
	defer c.ContainerRemove(ctx, cID, types.ContainerRemoveOptions{Force: true})

	inspect, err = c.ContainerInspect(ctx, cID)
Expand Down

2 changes: 1 addition & 1 deletion
integration/container/diff_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ func TestDiff(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", `mkdir /foo; echo xyzzy > /foo/bar`))
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", `mkdir /foo; echo xyzzy > /foo/bar`))

	// Wait for it to exit as cannot diff a running container on Windows, and
	// it will take a few seconds to exit. Also there's no way in Windows to
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/exec_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestExecWithCloseStdin(t *testing.T) {
	client := testEnv.APIClient()

	// run top with detached mode
	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)

	expected := "closeIO"
	execResp, err := client.ContainerExecCreate(ctx, cID,
Expand DownExpand Up@@ -90,7 +90,7 @@ func TestExec(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithTty(true), container.WithWorkingDir("/root"))
	cID := container.Run(ctx, t, client, container.WithTty(true), container.WithWorkingDir("/root"))

	id, err := client.ContainerExecCreate(ctx, cID,
 types.ExecConfig{
Expand DownExpand Up@@ -125,7 +125,7 @@ func TestExecUser(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithTty(true), container.WithUser("1:1"))
	cID := container.Run(ctx, t, client, container.WithTty(true), container.WithUser("1:1"))

	result, err := container.Exec(ctx, client, cID, []string{"id"})
	assert.NilError(t, err)
Expand Down

4 changes: 2 additions & 2 deletions
integration/container/export_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ func TestExportContainerAndImportImage(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithCmd("true"))
	cID := container.Run(ctx, t, client, container.WithCmd("true"))
	poll.WaitOn(t, container.IsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond))

	reference := "repo/testexp:v1"
Expand DownExpand Up@@ -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)

Expand Down

4 changes: 2 additions & 2 deletions
integration/container/health_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ func TestHealthCheckWorkdir(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithTty(true), container.WithWorkingDir("/foo"), func(c *container.TestContainerConfig) {
	cID := container.Run(ctx, t, client, container.WithTty(true), container.WithWorkingDir("/foo"), func(c *container.TestContainerConfig) {
 c.Config.Healthcheck = &containertypes.HealthConfig{
 Test: []string{"CMD-SHELL", "if [ \"$PWD\" = \"/foo\" ]; then exit 0; else exit 1; fi;"},
 Interval: 50 * time.Millisecond,
Expand All@@ -42,7 +42,7 @@ func TestHealthKillContainer(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	id := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
	id := container.Run(ctx, t, client, func(c *container.TestContainerConfig) {
 c.Config.Healthcheck = &containertypes.HealthConfig{
 Test: []string{"CMD-SHELL", "sleep 1"},
 Interval: time.Second,
Expand Down

2 changes: 1 addition & 1 deletion
integration/container/inspect_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestInspectCpusetInConfigPre120(t *testing.T) {

	name := "cpusetinconfig-pre120-" + t.Name()
	// Create container with up to-date-API
	container.Run(t, ctx, request.NewAPIClient(t), container.WithName(name),
	container.Run(ctx, t, request.NewAPIClient(t), container.WithName(name),
 container.WithCmd("true"),
 func(c *container.TestContainerConfig) {
 c.HostConfig.Resources.CpusetCpus = "0"
Expand Down

4 changes: 2 additions & 2 deletions
integration/container/ipcmode_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -308,15 +308,15 @@ 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)
	assert.Check(t, is.Equal(string(inspect.HostConfig.IpcMode), "private"))

	// 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)
Expand Down

16 changes: 8 additions & 8 deletions
integration/container/kill_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ func TestKillContainerInvalidSignal(t *testing.T) {
	defer setupTest(t)()
	client := testEnv.APIClient()
	ctx := context.Background()
	id := container.Run(t, ctx, client)
	id := container.Run(ctx, t, client)

	err := client.ContainerKill(ctx, id, "0")
	assert.Error(t, err, "Error response from daemon: Invalid signal: 0")
Expand DownExpand Up@@ -60,7 +60,7 @@ func TestKillContainer(t *testing.T) {
 tc := tc
 t.Run(tc.doc, func(t *testing.T) {
 ctx := context.Background()
 id := container.Run(t, ctx, client)
 id := container.Run(ctx, t, client)
 err := client.ContainerKill(ctx, id, tc.signal)
 assert.NilError(t, err)

Expand DownExpand Up@@ -95,7 +95,7 @@ func TestKillWithStopSignalAndRestartPolicies(t *testing.T) {
 tc := tc
 t.Run(tc.doc, func(t *testing.T) {
 ctx := context.Background()
 id := container.Run(t, ctx, client,
 id := container.Run(ctx, t, client,
 container.WithRestartPolicy("always"),
 func(c *container.TestContainerConfig) {
 c.Config.StopSignal = tc.stopsignal
Expand All@@ -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"))
Expand All@@ -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)
}
Expand All@@ -137,7 +137,7 @@ func TestKillDifferentUserContainer(t *testing.T) {
	ctx := context.Background()
	client := request.NewAPIClient(t, client.WithVersion("1.19"))

	id := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
	id := container.Run(ctx, t, client, func(c *container.TestContainerConfig) {
 c.Config.User = "daemon"
	})
	poll.WaitOn(t, container.IsInState(ctx, client, id, "running"), poll.WithDelay(100*time.Millisecond))
Expand All@@ -154,7 +154,7 @@ func TestInspectOomKilledTrue(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", "x=a; while true; do x=$x$x$x$x; done"), func(c *container.TestContainerConfig) {
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", "x=a; while true; do x=$x$x$x$x; done"), func(c *container.TestContainerConfig) {
 c.HostConfig.Resources.Memory = 32 * 1024 * 1024
	})

Expand All@@ -172,7 +172,7 @@ func TestInspectOomKilledFalse(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", "echo hello world"))
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", "echo hello world"))

	poll.WaitOn(t, container.IsInState(ctx, client, cID, "exited"), poll.WithDelay(100*time.Millisecond))

Expand Down

6 changes: 3 additions & 3 deletions
integration/container/links_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestLinksEtcHostsContentMatch(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithNetworkMode("host"))
	cID := container.Run(ctx, t, client, container.WithNetworkMode("host"))
	res, err := container.Exec(ctx, client, cID, []string{"cat", "/etc/hosts"})
	assert.NilError(t, err)
	assert.Assert(t, is.Len(res.Stderr(), 0))
Expand All@@ -42,8 +42,8 @@ func TestLinksContainerNames(t *testing.T) {

	containerA := "first_" + t.Name()
	containerB := "second_" + t.Name()
	container.Run(t, ctx, client, container.WithName(containerA))
	container.Run(t, ctx, client, container.WithName(containerB), container.WithLinks(containerA+":"+containerA))
	container.Run(ctx, t, client, container.WithName(containerA))
	container.Run(ctx, t, client, container.WithName(containerB), container.WithLinks(containerA+":"+containerA))

	f := filters.NewArgs(filters.Arg("name", containerA))

Expand Down

2 changes: 1 addition & 1 deletion
integration/container/logs_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ func TestLogsFollowTailEmpty(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	id := container.Run(t, ctx, client, container.WithCmd("sleep", "100000"))
	id := container.Run(ctx, t, client, container.WithCmd("sleep", "100000"))

	logs, err := client.ContainerLogs(ctx, id, types.ContainerLogsOptions{ShowStdout: true, Tail: "2"})
	if logs != nil {
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/mounts_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -256,9 +256,9 @@ func TestContainerBindMountNonRecursive(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()
	containers := []string{
 container.Run(t, ctx, client, container.WithMount(implicit), container.WithCmd(recursiveVerifier...)),
 container.Run(t, ctx, client, container.WithMount(recursive), container.WithCmd(recursiveVerifier...)),
 container.Run(t, ctx, client, container.WithMount(nonRecursive), container.WithCmd(nonRecursiveVerifier...)),
 container.Run(ctx, t, client, container.WithMount(implicit), container.WithCmd(recursiveVerifier...)),
 container.Run(ctx, t, client, container.WithMount(recursive), container.WithCmd(recursiveVerifier...)),
 container.Run(ctx, t, client, container.WithMount(nonRecursive), container.WithCmd(nonRecursiveVerifier...)),
	}

	for _, c := range containers {
Expand Down

4 changes: 2 additions & 2 deletions
integration/container/nat_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ func TestNetworkLoopbackNat(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String())), container.WithTty(true), container.WithNetworkMode("container:"+serverContainerID))
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String())), container.WithTty(true), container.WithNetworkMode("container:"+serverContainerID))

	poll.WaitOn(t, container.IsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond))

Expand All@@ -93,7 +93,7 @@ func startServerContainer(t *testing.T, msg string, port int) string {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithName("server-"+t.Name()), container.WithCmd("sh", "-c", fmt.Sprintf("echo %q | nc -lp %d", msg, port)), container.WithExposedPorts(fmt.Sprintf("%d/tcp", port)), func(c *container.TestContainerConfig) {
	cID := container.Run(ctx, t, client, container.WithName("server-"+t.Name()), container.WithCmd("sh", "-c", fmt.Sprintf("echo %q | nc -lp %d", msg, port)), container.WithExposedPorts(fmt.Sprintf("%d/tcp", port)), func(c *container.TestContainerConfig) {
 c.HostConfig.PortBindings = nat.PortMap{
 nat.Port(fmt.Sprintf("%d/tcp", port)): []nat.PortBinding{
 {
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/pause_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ func TestPause(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)
	poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

	since := request.DaemonUnixTime(ctx, t, client, testEnv)
Expand DownExpand Up@@ -57,7 +57,7 @@ func TestPauseFailsOnWindowsServerContainers(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)
	poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

	err := client.ContainerPause(ctx, cID)
Expand All@@ -71,7 +71,7 @@ func TestPauseStopPausedContainer(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)
	poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

	err := client.ContainerPause(ctx, cID)
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/ps_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content

This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[19.03 backport] Integration: change signatures to fix golint warnings#281
 Merged

andrewhsu
merged 8 commits into

from

Sep 23, 2019
 Merged


[19.03 backport] Integration: change signatures to fix golint warnings
#281
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
235fa0e

Revert "integration: have container.Create call compile"


thaJeztah Aug 13, 2019
9175772

integration: change network.CreateNoError signature to fix linting


thaJeztah Jun 6, 2019
9c49308

integration: change container.Create signature to fix linting


thaJeztah Jun 6, 2019
3ade7ca

integration: change container.Run signature to fix linting


thaJeztah Jun 6, 2019
3f4338c

integration: change createAmbiguousNetworks signature to fix linting


thaJeztah Jun 6, 2019
168132b

integration: change testGraphDriver signature to fix linting


thaJeztah Jun 6, 2019
51f390d

integration: get tests to compile again

Jun 12, 2019
0d6d5b3

Revert "Fixing integration test"


thaJeztah Sep 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
integration/build/build_squash_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ func TestBuildSquashParent(t *testing.T) {
	resp.Body.Close()
	assert.NilError(t, err)

	cid := container.Run(t, ctx, client,
	cid := container.Run(ctx, t, client,
 container.WithImage(name),
 container.WithCmd("/bin/sh", "-c", "cat /hello"),
	)
Expand All@@ -94,11 +94,11 @@ func TestBuildSquashParent(t *testing.T) {
	assert.NilError(t, err)
	assert.Check(t, is.Equal(strings.TrimSpace(actualStdout.String()), "hello\nworld"))

	container.Run(t, ctx, client,
	container.Run(ctx, t, client,
 container.WithImage(name),
 container.WithCmd("/bin/sh", "-c", "[ ! -f /remove_me ]"),
	)
	container.Run(t, ctx, client,
	container.Run(ctx, t, client,
 container.WithImage(name),
 container.WithCmd("/bin/sh", "-c", `[ "$(echo $HELLO)" == "world" ]`),
	)
Expand Down

2 changes: 1 addition & 1 deletion
integration/container/checkpoint_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ func TestCheckpoint(t *testing.T) {
	}

	t.Log("Start a container")
	cID := container.Run(t, ctx, client, container.WithMount(mnt))
	cID := container.Run(ctx, t, client, container.WithMount(mnt))
	poll.WaitOn(t,
 container.IsInState(ctx, client, cID, "running"),
 poll.WithDelay(100*time.Millisecond),
Expand Down

10 changes: 5 additions & 5 deletions
integration/container/copy_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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))
Expand All@@ -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"))
Expand All@@ -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))
Expand All@@ -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"))
Expand DownExpand Up@@ -105,7 +105,7 @@ func TestCopyFromContainer(t *testing.T) {
	assert.NilError(t, err)
	assert.Assert(t, imageID != "")

	cid := container.Create(t, ctx, apiClient, container.WithImage(imageID))
	cid := container.Create(ctx, t, apiClient, container.WithImage(imageID))

	for _, x := range []struct {
 src string
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/daemon_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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{})
Expand DownExpand Up@@ -94,7 +94,7 @@ func TestDaemonRestartIpcMode(t *testing.T) {
	ctx := context.Background()

	// check the container is created with private ipc mode as per daemon default
	cID := container.Run(t, ctx, c,
	cID := container.Run(ctx, t, c,
 container.WithCmd("top"),
 container.WithRestartPolicy("always"),
	)
Expand All@@ -113,7 +113,7 @@ func TestDaemonRestartIpcMode(t *testing.T) {
	assert.Check(t, is.Equal(string(inspect.HostConfig.IpcMode), "private"))

	// check a new container is created with shareable ipc mode as per new daemon default
	cID = container.Run(t, ctx, c)
	cID = container.Run(ctx, t, c)
	defer c.ContainerRemove(ctx, cID, types.ContainerRemoveOptions{Force: true})

	inspect, err = c.ContainerInspect(ctx, cID)
Expand Down

2 changes: 1 addition & 1 deletion
integration/container/diff_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ func TestDiff(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", `mkdir /foo; echo xyzzy > /foo/bar`))
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", `mkdir /foo; echo xyzzy > /foo/bar`))

	// Wait for it to exit as cannot diff a running container on Windows, and
	// it will take a few seconds to exit. Also there's no way in Windows to
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/exec_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestExecWithCloseStdin(t *testing.T) {
	client := testEnv.APIClient()

	// run top with detached mode
	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)

	expected := "closeIO"
	execResp, err := client.ContainerExecCreate(ctx, cID,
Expand DownExpand Up@@ -90,7 +90,7 @@ func TestExec(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithTty(true), container.WithWorkingDir("/root"))
	cID := container.Run(ctx, t, client, container.WithTty(true), container.WithWorkingDir("/root"))

	id, err := client.ContainerExecCreate(ctx, cID,
 types.ExecConfig{
Expand DownExpand Up@@ -125,7 +125,7 @@ func TestExecUser(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithTty(true), container.WithUser("1:1"))
	cID := container.Run(ctx, t, client, container.WithTty(true), container.WithUser("1:1"))

	result, err := container.Exec(ctx, client, cID, []string{"id"})
	assert.NilError(t, err)
Expand Down

4 changes: 2 additions & 2 deletions
integration/container/export_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ func TestExportContainerAndImportImage(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithCmd("true"))
	cID := container.Run(ctx, t, client, container.WithCmd("true"))
	poll.WaitOn(t, container.IsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond))

	reference := "repo/testexp:v1"
Expand DownExpand Up@@ -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)

Expand Down

4 changes: 2 additions & 2 deletions
integration/container/health_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ func TestHealthCheckWorkdir(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithTty(true), container.WithWorkingDir("/foo"), func(c *container.TestContainerConfig) {
	cID := container.Run(ctx, t, client, container.WithTty(true), container.WithWorkingDir("/foo"), func(c *container.TestContainerConfig) {
 c.Config.Healthcheck = &containertypes.HealthConfig{
 Test: []string{"CMD-SHELL", "if [ \"$PWD\" = \"/foo\" ]; then exit 0; else exit 1; fi;"},
 Interval: 50 * time.Millisecond,
Expand All@@ -42,7 +42,7 @@ func TestHealthKillContainer(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	id := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
	id := container.Run(ctx, t, client, func(c *container.TestContainerConfig) {
 c.Config.Healthcheck = &containertypes.HealthConfig{
 Test: []string{"CMD-SHELL", "sleep 1"},
 Interval: time.Second,
Expand Down

2 changes: 1 addition & 1 deletion
integration/container/inspect_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestInspectCpusetInConfigPre120(t *testing.T) {

	name := "cpusetinconfig-pre120-" + t.Name()
	// Create container with up to-date-API
	container.Run(t, ctx, request.NewAPIClient(t), container.WithName(name),
	container.Run(ctx, t, request.NewAPIClient(t), container.WithName(name),
 container.WithCmd("true"),
 func(c *container.TestContainerConfig) {
 c.HostConfig.Resources.CpusetCpus = "0"
Expand Down

4 changes: 2 additions & 2 deletions
integration/container/ipcmode_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -308,15 +308,15 @@ 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)
	assert.Check(t, is.Equal(string(inspect.HostConfig.IpcMode), "private"))

	// 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)
Expand Down

16 changes: 8 additions & 8 deletions
integration/container/kill_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ func TestKillContainerInvalidSignal(t *testing.T) {
	defer setupTest(t)()
	client := testEnv.APIClient()
	ctx := context.Background()
	id := container.Run(t, ctx, client)
	id := container.Run(ctx, t, client)

	err := client.ContainerKill(ctx, id, "0")
	assert.Error(t, err, "Error response from daemon: Invalid signal: 0")
Expand DownExpand Up@@ -60,7 +60,7 @@ func TestKillContainer(t *testing.T) {
 tc := tc
 t.Run(tc.doc, func(t *testing.T) {
 ctx := context.Background()
 id := container.Run(t, ctx, client)
 id := container.Run(ctx, t, client)
 err := client.ContainerKill(ctx, id, tc.signal)
 assert.NilError(t, err)

Expand DownExpand Up@@ -95,7 +95,7 @@ func TestKillWithStopSignalAndRestartPolicies(t *testing.T) {
 tc := tc
 t.Run(tc.doc, func(t *testing.T) {
 ctx := context.Background()
 id := container.Run(t, ctx, client,
 id := container.Run(ctx, t, client,
 container.WithRestartPolicy("always"),
 func(c *container.TestContainerConfig) {
 c.Config.StopSignal = tc.stopsignal
Expand All@@ -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"))
Expand All@@ -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)
}
Expand All@@ -137,7 +137,7 @@ func TestKillDifferentUserContainer(t *testing.T) {
	ctx := context.Background()
	client := request.NewAPIClient(t, client.WithVersion("1.19"))

	id := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
	id := container.Run(ctx, t, client, func(c *container.TestContainerConfig) {
 c.Config.User = "daemon"
	})
	poll.WaitOn(t, container.IsInState(ctx, client, id, "running"), poll.WithDelay(100*time.Millisecond))
Expand All@@ -154,7 +154,7 @@ func TestInspectOomKilledTrue(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", "x=a; while true; do x=$x$x$x$x; done"), func(c *container.TestContainerConfig) {
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", "x=a; while true; do x=$x$x$x$x; done"), func(c *container.TestContainerConfig) {
 c.HostConfig.Resources.Memory = 32 * 1024 * 1024
	})

Expand All@@ -172,7 +172,7 @@ func TestInspectOomKilledFalse(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", "echo hello world"))
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", "echo hello world"))

	poll.WaitOn(t, container.IsInState(ctx, client, cID, "exited"), poll.WithDelay(100*time.Millisecond))

Expand Down

6 changes: 3 additions & 3 deletions
integration/container/links_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestLinksEtcHostsContentMatch(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithNetworkMode("host"))
	cID := container.Run(ctx, t, client, container.WithNetworkMode("host"))
	res, err := container.Exec(ctx, client, cID, []string{"cat", "/etc/hosts"})
	assert.NilError(t, err)
	assert.Assert(t, is.Len(res.Stderr(), 0))
Expand All@@ -42,8 +42,8 @@ func TestLinksContainerNames(t *testing.T) {

	containerA := "first_" + t.Name()
	containerB := "second_" + t.Name()
	container.Run(t, ctx, client, container.WithName(containerA))
	container.Run(t, ctx, client, container.WithName(containerB), container.WithLinks(containerA+":"+containerA))
	container.Run(ctx, t, client, container.WithName(containerA))
	container.Run(ctx, t, client, container.WithName(containerB), container.WithLinks(containerA+":"+containerA))

	f := filters.NewArgs(filters.Arg("name", containerA))

Expand Down

2 changes: 1 addition & 1 deletion
integration/container/logs_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ func TestLogsFollowTailEmpty(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	id := container.Run(t, ctx, client, container.WithCmd("sleep", "100000"))
	id := container.Run(ctx, t, client, container.WithCmd("sleep", "100000"))

	logs, err := client.ContainerLogs(ctx, id, types.ContainerLogsOptions{ShowStdout: true, Tail: "2"})
	if logs != nil {
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/mounts_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -256,9 +256,9 @@ func TestContainerBindMountNonRecursive(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()
	containers := []string{
 container.Run(t, ctx, client, container.WithMount(implicit), container.WithCmd(recursiveVerifier...)),
 container.Run(t, ctx, client, container.WithMount(recursive), container.WithCmd(recursiveVerifier...)),
 container.Run(t, ctx, client, container.WithMount(nonRecursive), container.WithCmd(nonRecursiveVerifier...)),
 container.Run(ctx, t, client, container.WithMount(implicit), container.WithCmd(recursiveVerifier...)),
 container.Run(ctx, t, client, container.WithMount(recursive), container.WithCmd(recursiveVerifier...)),
 container.Run(ctx, t, client, container.WithMount(nonRecursive), container.WithCmd(nonRecursiveVerifier...)),
	}

	for _, c := range containers {
Expand Down

4 changes: 2 additions & 2 deletions
integration/container/nat_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ func TestNetworkLoopbackNat(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String())), container.WithTty(true), container.WithNetworkMode("container:"+serverContainerID))
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String())), container.WithTty(true), container.WithNetworkMode("container:"+serverContainerID))

	poll.WaitOn(t, container.IsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond))

Expand All@@ -93,7 +93,7 @@ func startServerContainer(t *testing.T, msg string, port int) string {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithName("server-"+t.Name()), container.WithCmd("sh", "-c", fmt.Sprintf("echo %q | nc -lp %d", msg, port)), container.WithExposedPorts(fmt.Sprintf("%d/tcp", port)), func(c *container.TestContainerConfig) {
	cID := container.Run(ctx, t, client, container.WithName("server-"+t.Name()), container.WithCmd("sh", "-c", fmt.Sprintf("echo %q | nc -lp %d", msg, port)), container.WithExposedPorts(fmt.Sprintf("%d/tcp", port)), func(c *container.TestContainerConfig) {
 c.HostConfig.PortBindings = nat.PortMap{
 nat.Port(fmt.Sprintf("%d/tcp", port)): []nat.PortBinding{
 {
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/pause_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ func TestPause(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)
	poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

	since := request.DaemonUnixTime(ctx, t, client, testEnv)
Expand DownExpand Up@@ -57,7 +57,7 @@ func TestPauseFailsOnWindowsServerContainers(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)
	poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

	err := client.ContainerPause(ctx, cID)
Expand All@@ -71,7 +71,7 @@ func TestPauseStopPausedContainer(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)
	poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

	err := client.ContainerPause(ctx, cID)
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/ps_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[19.03 backport] Integration: change signatures to fix golint warnings#281
 Merged

andrewhsu
merged 8 commits into

from

Sep 23, 2019
 Merged


[19.03 backport] Integration: change signatures to fix golint warnings
#281
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
235fa0e

Revert "integration: have container.Create call compile"


thaJeztah Aug 13, 2019
9175772

integration: change network.CreateNoError signature to fix linting


thaJeztah Jun 6, 2019
9c49308

integration: change container.Create signature to fix linting


thaJeztah Jun 6, 2019
3ade7ca

integration: change container.Run signature to fix linting


thaJeztah Jun 6, 2019
3f4338c

integration: change createAmbiguousNetworks signature to fix linting


thaJeztah Jun 6, 2019
168132b

integration: change testGraphDriver signature to fix linting


thaJeztah Jun 6, 2019
51f390d

integration: get tests to compile again

Jun 12, 2019
0d6d5b3

Revert "Fixing integration test"


thaJeztah Sep 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
integration/build/build_squash_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ func TestBuildSquashParent(t *testing.T) {
	resp.Body.Close()
	assert.NilError(t, err)

	cid := container.Run(t, ctx, client,
	cid := container.Run(ctx, t, client,
 container.WithImage(name),
 container.WithCmd("/bin/sh", "-c", "cat /hello"),
	)
Expand All@@ -94,11 +94,11 @@ func TestBuildSquashParent(t *testing.T) {
	assert.NilError(t, err)
	assert.Check(t, is.Equal(strings.TrimSpace(actualStdout.String()), "hello\nworld"))

	container.Run(t, ctx, client,
	container.Run(ctx, t, client,
 container.WithImage(name),
 container.WithCmd("/bin/sh", "-c", "[ ! -f /remove_me ]"),
	)
	container.Run(t, ctx, client,
	container.Run(ctx, t, client,
 container.WithImage(name),
 container.WithCmd("/bin/sh", "-c", `[ "$(echo $HELLO)" == "world" ]`),
	)
Expand Down

2 changes: 1 addition & 1 deletion
integration/container/checkpoint_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ func TestCheckpoint(t *testing.T) {
	}

	t.Log("Start a container")
	cID := container.Run(t, ctx, client, container.WithMount(mnt))
	cID := container.Run(ctx, t, client, container.WithMount(mnt))
	poll.WaitOn(t,
 container.IsInState(ctx, client, cID, "running"),
 poll.WithDelay(100*time.Millisecond),
Expand Down

10 changes: 5 additions & 5 deletions
integration/container/copy_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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))
Expand All@@ -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"))
Expand All@@ -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))
Expand All@@ -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"))
Expand DownExpand Up@@ -105,7 +105,7 @@ func TestCopyFromContainer(t *testing.T) {
	assert.NilError(t, err)
	assert.Assert(t, imageID != "")

	cid := container.Create(t, ctx, apiClient, container.WithImage(imageID))
	cid := container.Create(ctx, t, apiClient, container.WithImage(imageID))

	for _, x := range []struct {
 src string
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/daemon_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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{})
Expand DownExpand Up@@ -94,7 +94,7 @@ func TestDaemonRestartIpcMode(t *testing.T) {
	ctx := context.Background()

	// check the container is created with private ipc mode as per daemon default
	cID := container.Run(t, ctx, c,
	cID := container.Run(ctx, t, c,
 container.WithCmd("top"),
 container.WithRestartPolicy("always"),
	)
Expand All@@ -113,7 +113,7 @@ func TestDaemonRestartIpcMode(t *testing.T) {
	assert.Check(t, is.Equal(string(inspect.HostConfig.IpcMode), "private"))

	// check a new container is created with shareable ipc mode as per new daemon default
	cID = container.Run(t, ctx, c)
	cID = container.Run(ctx, t, c)
	defer c.ContainerRemove(ctx, cID, types.ContainerRemoveOptions{Force: true})

	inspect, err = c.ContainerInspect(ctx, cID)
Expand Down

2 changes: 1 addition & 1 deletion
integration/container/diff_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ func TestDiff(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", `mkdir /foo; echo xyzzy > /foo/bar`))
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", `mkdir /foo; echo xyzzy > /foo/bar`))

	// Wait for it to exit as cannot diff a running container on Windows, and
	// it will take a few seconds to exit. Also there's no way in Windows to
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/exec_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestExecWithCloseStdin(t *testing.T) {
	client := testEnv.APIClient()

	// run top with detached mode
	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)

	expected := "closeIO"
	execResp, err := client.ContainerExecCreate(ctx, cID,
Expand DownExpand Up@@ -90,7 +90,7 @@ func TestExec(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithTty(true), container.WithWorkingDir("/root"))
	cID := container.Run(ctx, t, client, container.WithTty(true), container.WithWorkingDir("/root"))

	id, err := client.ContainerExecCreate(ctx, cID,
 types.ExecConfig{
Expand DownExpand Up@@ -125,7 +125,7 @@ func TestExecUser(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithTty(true), container.WithUser("1:1"))
	cID := container.Run(ctx, t, client, container.WithTty(true), container.WithUser("1:1"))

	result, err := container.Exec(ctx, client, cID, []string{"id"})
	assert.NilError(t, err)
Expand Down

4 changes: 2 additions & 2 deletions
integration/container/export_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ func TestExportContainerAndImportImage(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithCmd("true"))
	cID := container.Run(ctx, t, client, container.WithCmd("true"))
	poll.WaitOn(t, container.IsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond))

	reference := "repo/testexp:v1"
Expand DownExpand Up@@ -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)

Expand Down

4 changes: 2 additions & 2 deletions
integration/container/health_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ func TestHealthCheckWorkdir(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithTty(true), container.WithWorkingDir("/foo"), func(c *container.TestContainerConfig) {
	cID := container.Run(ctx, t, client, container.WithTty(true), container.WithWorkingDir("/foo"), func(c *container.TestContainerConfig) {
 c.Config.Healthcheck = &containertypes.HealthConfig{
 Test: []string{"CMD-SHELL", "if [ \"$PWD\" = \"/foo\" ]; then exit 0; else exit 1; fi;"},
 Interval: 50 * time.Millisecond,
Expand All@@ -42,7 +42,7 @@ func TestHealthKillContainer(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	id := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
	id := container.Run(ctx, t, client, func(c *container.TestContainerConfig) {
 c.Config.Healthcheck = &containertypes.HealthConfig{
 Test: []string{"CMD-SHELL", "sleep 1"},
 Interval: time.Second,
Expand Down

2 changes: 1 addition & 1 deletion
integration/container/inspect_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestInspectCpusetInConfigPre120(t *testing.T) {

	name := "cpusetinconfig-pre120-" + t.Name()
	// Create container with up to-date-API
	container.Run(t, ctx, request.NewAPIClient(t), container.WithName(name),
	container.Run(ctx, t, request.NewAPIClient(t), container.WithName(name),
 container.WithCmd("true"),
 func(c *container.TestContainerConfig) {
 c.HostConfig.Resources.CpusetCpus = "0"
Expand Down

4 changes: 2 additions & 2 deletions
integration/container/ipcmode_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -308,15 +308,15 @@ 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)
	assert.Check(t, is.Equal(string(inspect.HostConfig.IpcMode), "private"))

	// 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)
Expand Down

16 changes: 8 additions & 8 deletions
integration/container/kill_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ func TestKillContainerInvalidSignal(t *testing.T) {
	defer setupTest(t)()
	client := testEnv.APIClient()
	ctx := context.Background()
	id := container.Run(t, ctx, client)
	id := container.Run(ctx, t, client)

	err := client.ContainerKill(ctx, id, "0")
	assert.Error(t, err, "Error response from daemon: Invalid signal: 0")
Expand DownExpand Up@@ -60,7 +60,7 @@ func TestKillContainer(t *testing.T) {
 tc := tc
 t.Run(tc.doc, func(t *testing.T) {
 ctx := context.Background()
 id := container.Run(t, ctx, client)
 id := container.Run(ctx, t, client)
 err := client.ContainerKill(ctx, id, tc.signal)
 assert.NilError(t, err)

Expand DownExpand Up@@ -95,7 +95,7 @@ func TestKillWithStopSignalAndRestartPolicies(t *testing.T) {
 tc := tc
 t.Run(tc.doc, func(t *testing.T) {
 ctx := context.Background()
 id := container.Run(t, ctx, client,
 id := container.Run(ctx, t, client,
 container.WithRestartPolicy("always"),
 func(c *container.TestContainerConfig) {
 c.Config.StopSignal = tc.stopsignal
Expand All@@ -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"))
Expand All@@ -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)
}
Expand All@@ -137,7 +137,7 @@ func TestKillDifferentUserContainer(t *testing.T) {
	ctx := context.Background()
	client := request.NewAPIClient(t, client.WithVersion("1.19"))

	id := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
	id := container.Run(ctx, t, client, func(c *container.TestContainerConfig) {
 c.Config.User = "daemon"
	})
	poll.WaitOn(t, container.IsInState(ctx, client, id, "running"), poll.WithDelay(100*time.Millisecond))
Expand All@@ -154,7 +154,7 @@ func TestInspectOomKilledTrue(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", "x=a; while true; do x=$x$x$x$x; done"), func(c *container.TestContainerConfig) {
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", "x=a; while true; do x=$x$x$x$x; done"), func(c *container.TestContainerConfig) {
 c.HostConfig.Resources.Memory = 32 * 1024 * 1024
	})

Expand All@@ -172,7 +172,7 @@ func TestInspectOomKilledFalse(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", "echo hello world"))
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", "echo hello world"))

	poll.WaitOn(t, container.IsInState(ctx, client, cID, "exited"), poll.WithDelay(100*time.Millisecond))

Expand Down

6 changes: 3 additions & 3 deletions
integration/container/links_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestLinksEtcHostsContentMatch(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithNetworkMode("host"))
	cID := container.Run(ctx, t, client, container.WithNetworkMode("host"))
	res, err := container.Exec(ctx, client, cID, []string{"cat", "/etc/hosts"})
	assert.NilError(t, err)
	assert.Assert(t, is.Len(res.Stderr(), 0))
Expand All@@ -42,8 +42,8 @@ func TestLinksContainerNames(t *testing.T) {

	containerA := "first_" + t.Name()
	containerB := "second_" + t.Name()
	container.Run(t, ctx, client, container.WithName(containerA))
	container.Run(t, ctx, client, container.WithName(containerB), container.WithLinks(containerA+":"+containerA))
	container.Run(ctx, t, client, container.WithName(containerA))
	container.Run(ctx, t, client, container.WithName(containerB), container.WithLinks(containerA+":"+containerA))

	f := filters.NewArgs(filters.Arg("name", containerA))

Expand Down

2 changes: 1 addition & 1 deletion
integration/container/logs_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ func TestLogsFollowTailEmpty(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	id := container.Run(t, ctx, client, container.WithCmd("sleep", "100000"))
	id := container.Run(ctx, t, client, container.WithCmd("sleep", "100000"))

	logs, err := client.ContainerLogs(ctx, id, types.ContainerLogsOptions{ShowStdout: true, Tail: "2"})
	if logs != nil {
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/mounts_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -256,9 +256,9 @@ func TestContainerBindMountNonRecursive(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()
	containers := []string{
 container.Run(t, ctx, client, container.WithMount(implicit), container.WithCmd(recursiveVerifier...)),
 container.Run(t, ctx, client, container.WithMount(recursive), container.WithCmd(recursiveVerifier...)),
 container.Run(t, ctx, client, container.WithMount(nonRecursive), container.WithCmd(nonRecursiveVerifier...)),
 container.Run(ctx, t, client, container.WithMount(implicit), container.WithCmd(recursiveVerifier...)),
 container.Run(ctx, t, client, container.WithMount(recursive), container.WithCmd(recursiveVerifier...)),
 container.Run(ctx, t, client, container.WithMount(nonRecursive), container.WithCmd(nonRecursiveVerifier...)),
	}

	for _, c := range containers {
Expand Down

4 changes: 2 additions & 2 deletions
integration/container/nat_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ func TestNetworkLoopbackNat(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String())), container.WithTty(true), container.WithNetworkMode("container:"+serverContainerID))
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String())), container.WithTty(true), container.WithNetworkMode("container:"+serverContainerID))

	poll.WaitOn(t, container.IsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond))

Expand All@@ -93,7 +93,7 @@ func startServerContainer(t *testing.T, msg string, port int) string {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithName("server-"+t.Name()), container.WithCmd("sh", "-c", fmt.Sprintf("echo %q | nc -lp %d", msg, port)), container.WithExposedPorts(fmt.Sprintf("%d/tcp", port)), func(c *container.TestContainerConfig) {
	cID := container.Run(ctx, t, client, container.WithName("server-"+t.Name()), container.WithCmd("sh", "-c", fmt.Sprintf("echo %q | nc -lp %d", msg, port)), container.WithExposedPorts(fmt.Sprintf("%d/tcp", port)), func(c *container.TestContainerConfig) {
 c.HostConfig.PortBindings = nat.PortMap{
 nat.Port(fmt.Sprintf("%d/tcp", port)): []nat.PortBinding{
 {
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/pause_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ func TestPause(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)
	poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

	since := request.DaemonUnixTime(ctx, t, client, testEnv)
Expand DownExpand Up@@ -57,7 +57,7 @@ func TestPauseFailsOnWindowsServerContainers(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)
	poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

	err := client.ContainerPause(ctx, cID)
Expand All@@ -71,7 +71,7 @@ func TestPauseStopPausedContainer(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)
	poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

	err := client.ContainerPause(ctx, cID)
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/ps_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[19.03 backport] Integration: change signatures to fix golint warnings#281
 Merged

andrewhsu
merged 8 commits into

from

Sep 23, 2019
 Merged


[19.03 backport] Integration: change signatures to fix golint warnings
#281
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
235fa0e

Revert "integration: have container.Create call compile"


thaJeztah Aug 13, 2019
9175772

integration: change network.CreateNoError signature to fix linting


thaJeztah Jun 6, 2019
9c49308

integration: change container.Create signature to fix linting


thaJeztah Jun 6, 2019
3ade7ca

integration: change container.Run signature to fix linting


thaJeztah Jun 6, 2019
3f4338c

integration: change createAmbiguousNetworks signature to fix linting


thaJeztah Jun 6, 2019
168132b

integration: change testGraphDriver signature to fix linting


thaJeztah Jun 6, 2019
51f390d

integration: get tests to compile again

Jun 12, 2019
0d6d5b3

Revert "Fixing integration test"


thaJeztah Sep 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
integration/build/build_squash_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ func TestBuildSquashParent(t *testing.T) {
	resp.Body.Close()
	assert.NilError(t, err)

	cid := container.Run(t, ctx, client,
	cid := container.Run(ctx, t, client,
 container.WithImage(name),
 container.WithCmd("/bin/sh", "-c", "cat /hello"),
	)
Expand All@@ -94,11 +94,11 @@ func TestBuildSquashParent(t *testing.T) {
	assert.NilError(t, err)
	assert.Check(t, is.Equal(strings.TrimSpace(actualStdout.String()), "hello\nworld"))

	container.Run(t, ctx, client,
	container.Run(ctx, t, client,
 container.WithImage(name),
 container.WithCmd("/bin/sh", "-c", "[ ! -f /remove_me ]"),
	)
	container.Run(t, ctx, client,
	container.Run(ctx, t, client,
 container.WithImage(name),
 container.WithCmd("/bin/sh", "-c", `[ "$(echo $HELLO)" == "world" ]`),
	)
Expand Down

2 changes: 1 addition & 1 deletion
integration/container/checkpoint_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ func TestCheckpoint(t *testing.T) {
	}

	t.Log("Start a container")
	cID := container.Run(t, ctx, client, container.WithMount(mnt))
	cID := container.Run(ctx, t, client, container.WithMount(mnt))
	poll.WaitOn(t,
 container.IsInState(ctx, client, cID, "running"),
 poll.WithDelay(100*time.Millisecond),
Expand Down

10 changes: 5 additions & 5 deletions
integration/container/copy_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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))
Expand All@@ -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"))
Expand All@@ -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))
Expand All@@ -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"))
Expand DownExpand Up@@ -105,7 +105,7 @@ func TestCopyFromContainer(t *testing.T) {
	assert.NilError(t, err)
	assert.Assert(t, imageID != "")

	cid := container.Create(t, ctx, apiClient, container.WithImage(imageID))
	cid := container.Create(ctx, t, apiClient, container.WithImage(imageID))

	for _, x := range []struct {
 src string
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/daemon_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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{})
Expand DownExpand Up@@ -94,7 +94,7 @@ func TestDaemonRestartIpcMode(t *testing.T) {
	ctx := context.Background()

	// check the container is created with private ipc mode as per daemon default
	cID := container.Run(t, ctx, c,
	cID := container.Run(ctx, t, c,
 container.WithCmd("top"),
 container.WithRestartPolicy("always"),
	)
Expand All@@ -113,7 +113,7 @@ func TestDaemonRestartIpcMode(t *testing.T) {
	assert.Check(t, is.Equal(string(inspect.HostConfig.IpcMode), "private"))

	// check a new container is created with shareable ipc mode as per new daemon default
	cID = container.Run(t, ctx, c)
	cID = container.Run(ctx, t, c)
	defer c.ContainerRemove(ctx, cID, types.ContainerRemoveOptions{Force: true})

	inspect, err = c.ContainerInspect(ctx, cID)
Expand Down

2 changes: 1 addition & 1 deletion
integration/container/diff_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ func TestDiff(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", `mkdir /foo; echo xyzzy > /foo/bar`))
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", `mkdir /foo; echo xyzzy > /foo/bar`))

	// Wait for it to exit as cannot diff a running container on Windows, and
	// it will take a few seconds to exit. Also there's no way in Windows to
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/exec_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestExecWithCloseStdin(t *testing.T) {
	client := testEnv.APIClient()

	// run top with detached mode
	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)

	expected := "closeIO"
	execResp, err := client.ContainerExecCreate(ctx, cID,
Expand DownExpand Up@@ -90,7 +90,7 @@ func TestExec(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithTty(true), container.WithWorkingDir("/root"))
	cID := container.Run(ctx, t, client, container.WithTty(true), container.WithWorkingDir("/root"))

	id, err := client.ContainerExecCreate(ctx, cID,
 types.ExecConfig{
Expand DownExpand Up@@ -125,7 +125,7 @@ func TestExecUser(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithTty(true), container.WithUser("1:1"))
	cID := container.Run(ctx, t, client, container.WithTty(true), container.WithUser("1:1"))

	result, err := container.Exec(ctx, client, cID, []string{"id"})
	assert.NilError(t, err)
Expand Down

4 changes: 2 additions & 2 deletions
integration/container/export_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ func TestExportContainerAndImportImage(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithCmd("true"))
	cID := container.Run(ctx, t, client, container.WithCmd("true"))
	poll.WaitOn(t, container.IsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond))

	reference := "repo/testexp:v1"
Expand DownExpand Up@@ -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)

Expand Down

4 changes: 2 additions & 2 deletions
integration/container/health_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ func TestHealthCheckWorkdir(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithTty(true), container.WithWorkingDir("/foo"), func(c *container.TestContainerConfig) {
	cID := container.Run(ctx, t, client, container.WithTty(true), container.WithWorkingDir("/foo"), func(c *container.TestContainerConfig) {
 c.Config.Healthcheck = &containertypes.HealthConfig{
 Test: []string{"CMD-SHELL", "if [ \"$PWD\" = \"/foo\" ]; then exit 0; else exit 1; fi;"},
 Interval: 50 * time.Millisecond,
Expand All@@ -42,7 +42,7 @@ func TestHealthKillContainer(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	id := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
	id := container.Run(ctx, t, client, func(c *container.TestContainerConfig) {
 c.Config.Healthcheck = &containertypes.HealthConfig{
 Test: []string{"CMD-SHELL", "sleep 1"},
 Interval: time.Second,
Expand Down

2 changes: 1 addition & 1 deletion
integration/container/inspect_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestInspectCpusetInConfigPre120(t *testing.T) {

	name := "cpusetinconfig-pre120-" + t.Name()
	// Create container with up to-date-API
	container.Run(t, ctx, request.NewAPIClient(t), container.WithName(name),
	container.Run(ctx, t, request.NewAPIClient(t), container.WithName(name),
 container.WithCmd("true"),
 func(c *container.TestContainerConfig) {
 c.HostConfig.Resources.CpusetCpus = "0"
Expand Down

4 changes: 2 additions & 2 deletions
integration/container/ipcmode_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -308,15 +308,15 @@ 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)
	assert.Check(t, is.Equal(string(inspect.HostConfig.IpcMode), "private"))

	// 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)
Expand Down

16 changes: 8 additions & 8 deletions
integration/container/kill_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ func TestKillContainerInvalidSignal(t *testing.T) {
	defer setupTest(t)()
	client := testEnv.APIClient()
	ctx := context.Background()
	id := container.Run(t, ctx, client)
	id := container.Run(ctx, t, client)

	err := client.ContainerKill(ctx, id, "0")
	assert.Error(t, err, "Error response from daemon: Invalid signal: 0")
Expand DownExpand Up@@ -60,7 +60,7 @@ func TestKillContainer(t *testing.T) {
 tc := tc
 t.Run(tc.doc, func(t *testing.T) {
 ctx := context.Background()
 id := container.Run(t, ctx, client)
 id := container.Run(ctx, t, client)
 err := client.ContainerKill(ctx, id, tc.signal)
 assert.NilError(t, err)

Expand DownExpand Up@@ -95,7 +95,7 @@ func TestKillWithStopSignalAndRestartPolicies(t *testing.T) {
 tc := tc
 t.Run(tc.doc, func(t *testing.T) {
 ctx := context.Background()
 id := container.Run(t, ctx, client,
 id := container.Run(ctx, t, client,
 container.WithRestartPolicy("always"),
 func(c *container.TestContainerConfig) {
 c.Config.StopSignal = tc.stopsignal
Expand All@@ -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"))
Expand All@@ -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)
}
Expand All@@ -137,7 +137,7 @@ func TestKillDifferentUserContainer(t *testing.T) {
	ctx := context.Background()
	client := request.NewAPIClient(t, client.WithVersion("1.19"))

	id := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
	id := container.Run(ctx, t, client, func(c *container.TestContainerConfig) {
 c.Config.User = "daemon"
	})
	poll.WaitOn(t, container.IsInState(ctx, client, id, "running"), poll.WithDelay(100*time.Millisecond))
Expand All@@ -154,7 +154,7 @@ func TestInspectOomKilledTrue(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", "x=a; while true; do x=$x$x$x$x; done"), func(c *container.TestContainerConfig) {
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", "x=a; while true; do x=$x$x$x$x; done"), func(c *container.TestContainerConfig) {
 c.HostConfig.Resources.Memory = 32 * 1024 * 1024
	})

Expand All@@ -172,7 +172,7 @@ func TestInspectOomKilledFalse(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", "echo hello world"))
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", "echo hello world"))

	poll.WaitOn(t, container.IsInState(ctx, client, cID, "exited"), poll.WithDelay(100*time.Millisecond))

Expand Down

6 changes: 3 additions & 3 deletions
integration/container/links_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestLinksEtcHostsContentMatch(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithNetworkMode("host"))
	cID := container.Run(ctx, t, client, container.WithNetworkMode("host"))
	res, err := container.Exec(ctx, client, cID, []string{"cat", "/etc/hosts"})
	assert.NilError(t, err)
	assert.Assert(t, is.Len(res.Stderr(), 0))
Expand All@@ -42,8 +42,8 @@ func TestLinksContainerNames(t *testing.T) {

	containerA := "first_" + t.Name()
	containerB := "second_" + t.Name()
	container.Run(t, ctx, client, container.WithName(containerA))
	container.Run(t, ctx, client, container.WithName(containerB), container.WithLinks(containerA+":"+containerA))
	container.Run(ctx, t, client, container.WithName(containerA))
	container.Run(ctx, t, client, container.WithName(containerB), container.WithLinks(containerA+":"+containerA))

	f := filters.NewArgs(filters.Arg("name", containerA))

Expand Down

2 changes: 1 addition & 1 deletion
integration/container/logs_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ func TestLogsFollowTailEmpty(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	id := container.Run(t, ctx, client, container.WithCmd("sleep", "100000"))
	id := container.Run(ctx, t, client, container.WithCmd("sleep", "100000"))

	logs, err := client.ContainerLogs(ctx, id, types.ContainerLogsOptions{ShowStdout: true, Tail: "2"})
	if logs != nil {
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/mounts_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -256,9 +256,9 @@ func TestContainerBindMountNonRecursive(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()
	containers := []string{
 container.Run(t, ctx, client, container.WithMount(implicit), container.WithCmd(recursiveVerifier...)),
 container.Run(t, ctx, client, container.WithMount(recursive), container.WithCmd(recursiveVerifier...)),
 container.Run(t, ctx, client, container.WithMount(nonRecursive), container.WithCmd(nonRecursiveVerifier...)),
 container.Run(ctx, t, client, container.WithMount(implicit), container.WithCmd(recursiveVerifier...)),
 container.Run(ctx, t, client, container.WithMount(recursive), container.WithCmd(recursiveVerifier...)),
 container.Run(ctx, t, client, container.WithMount(nonRecursive), container.WithCmd(nonRecursiveVerifier...)),
	}

	for _, c := range containers {
Expand Down

4 changes: 2 additions & 2 deletions
integration/container/nat_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ func TestNetworkLoopbackNat(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String())), container.WithTty(true), container.WithNetworkMode("container:"+serverContainerID))
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String())), container.WithTty(true), container.WithNetworkMode("container:"+serverContainerID))

	poll.WaitOn(t, container.IsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond))

Expand All@@ -93,7 +93,7 @@ func startServerContainer(t *testing.T, msg string, port int) string {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithName("server-"+t.Name()), container.WithCmd("sh", "-c", fmt.Sprintf("echo %q | nc -lp %d", msg, port)), container.WithExposedPorts(fmt.Sprintf("%d/tcp", port)), func(c *container.TestContainerConfig) {
	cID := container.Run(ctx, t, client, container.WithName("server-"+t.Name()), container.WithCmd("sh", "-c", fmt.Sprintf("echo %q | nc -lp %d", msg, port)), container.WithExposedPorts(fmt.Sprintf("%d/tcp", port)), func(c *container.TestContainerConfig) {
 c.HostConfig.PortBindings = nat.PortMap{
 nat.Port(fmt.Sprintf("%d/tcp", port)): []nat.PortBinding{
 {
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/pause_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ func TestPause(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)
	poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

	since := request.DaemonUnixTime(ctx, t, client, testEnv)
Expand DownExpand Up@@ -57,7 +57,7 @@ func TestPauseFailsOnWindowsServerContainers(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)
	poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

	err := client.ContainerPause(ctx, cID)
Expand All@@ -71,7 +71,7 @@ func TestPauseStopPausedContainer(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)
	poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

	err := client.ContainerPause(ctx, cID)
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/ps_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content

This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[19.03 backport] Integration: change signatures to fix golint warnings#281
 Merged

andrewhsu
merged 8 commits into

from

Sep 23, 2019
 Merged


[19.03 backport] Integration: change signatures to fix golint warnings
#281
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
235fa0e

Revert "integration: have container.Create call compile"


thaJeztah Aug 13, 2019
9175772

integration: change network.CreateNoError signature to fix linting


thaJeztah Jun 6, 2019
9c49308

integration: change container.Create signature to fix linting


thaJeztah Jun 6, 2019
3ade7ca

integration: change container.Run signature to fix linting


thaJeztah Jun 6, 2019
3f4338c

integration: change createAmbiguousNetworks signature to fix linting


thaJeztah Jun 6, 2019
168132b

integration: change testGraphDriver signature to fix linting


thaJeztah Jun 6, 2019
51f390d

integration: get tests to compile again

Jun 12, 2019
0d6d5b3

Revert "Fixing integration test"


thaJeztah Sep 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
integration/build/build_squash_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ func TestBuildSquashParent(t *testing.T) {
	resp.Body.Close()
	assert.NilError(t, err)

	cid := container.Run(t, ctx, client,
	cid := container.Run(ctx, t, client,
 container.WithImage(name),
 container.WithCmd("/bin/sh", "-c", "cat /hello"),
	)
Expand All@@ -94,11 +94,11 @@ func TestBuildSquashParent(t *testing.T) {
	assert.NilError(t, err)
	assert.Check(t, is.Equal(strings.TrimSpace(actualStdout.String()), "hello\nworld"))

	container.Run(t, ctx, client,
	container.Run(ctx, t, client,
 container.WithImage(name),
 container.WithCmd("/bin/sh", "-c", "[ ! -f /remove_me ]"),
	)
	container.Run(t, ctx, client,
	container.Run(ctx, t, client,
 container.WithImage(name),
 container.WithCmd("/bin/sh", "-c", `[ "$(echo $HELLO)" == "world" ]`),
	)
Expand Down

2 changes: 1 addition & 1 deletion
integration/container/checkpoint_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ func TestCheckpoint(t *testing.T) {
	}

	t.Log("Start a container")
	cID := container.Run(t, ctx, client, container.WithMount(mnt))
	cID := container.Run(ctx, t, client, container.WithMount(mnt))
	poll.WaitOn(t,
 container.IsInState(ctx, client, cID, "running"),
 poll.WithDelay(100*time.Millisecond),
Expand Down

10 changes: 5 additions & 5 deletions
integration/container/copy_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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))
Expand All@@ -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"))
Expand All@@ -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))
Expand All@@ -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"))
Expand DownExpand Up@@ -105,7 +105,7 @@ func TestCopyFromContainer(t *testing.T) {
	assert.NilError(t, err)
	assert.Assert(t, imageID != "")

	cid := container.Create(t, ctx, apiClient, container.WithImage(imageID))
	cid := container.Create(ctx, t, apiClient, container.WithImage(imageID))

	for _, x := range []struct {
 src string
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/daemon_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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{})
Expand DownExpand Up@@ -94,7 +94,7 @@ func TestDaemonRestartIpcMode(t *testing.T) {
	ctx := context.Background()

	// check the container is created with private ipc mode as per daemon default
	cID := container.Run(t, ctx, c,
	cID := container.Run(ctx, t, c,
 container.WithCmd("top"),
 container.WithRestartPolicy("always"),
	)
Expand All@@ -113,7 +113,7 @@ func TestDaemonRestartIpcMode(t *testing.T) {
	assert.Check(t, is.Equal(string(inspect.HostConfig.IpcMode), "private"))

	// check a new container is created with shareable ipc mode as per new daemon default
	cID = container.Run(t, ctx, c)
	cID = container.Run(ctx, t, c)
	defer c.ContainerRemove(ctx, cID, types.ContainerRemoveOptions{Force: true})

	inspect, err = c.ContainerInspect(ctx, cID)
Expand Down

2 changes: 1 addition & 1 deletion
integration/container/diff_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ func TestDiff(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", `mkdir /foo; echo xyzzy > /foo/bar`))
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", `mkdir /foo; echo xyzzy > /foo/bar`))

	// Wait for it to exit as cannot diff a running container on Windows, and
	// it will take a few seconds to exit. Also there's no way in Windows to
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/exec_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestExecWithCloseStdin(t *testing.T) {
	client := testEnv.APIClient()

	// run top with detached mode
	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)

	expected := "closeIO"
	execResp, err := client.ContainerExecCreate(ctx, cID,
Expand DownExpand Up@@ -90,7 +90,7 @@ func TestExec(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithTty(true), container.WithWorkingDir("/root"))
	cID := container.Run(ctx, t, client, container.WithTty(true), container.WithWorkingDir("/root"))

	id, err := client.ContainerExecCreate(ctx, cID,
 types.ExecConfig{
Expand DownExpand Up@@ -125,7 +125,7 @@ func TestExecUser(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithTty(true), container.WithUser("1:1"))
	cID := container.Run(ctx, t, client, container.WithTty(true), container.WithUser("1:1"))

	result, err := container.Exec(ctx, client, cID, []string{"id"})
	assert.NilError(t, err)
Expand Down

4 changes: 2 additions & 2 deletions
integration/container/export_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ func TestExportContainerAndImportImage(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithCmd("true"))
	cID := container.Run(ctx, t, client, container.WithCmd("true"))
	poll.WaitOn(t, container.IsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond))

	reference := "repo/testexp:v1"
Expand DownExpand Up@@ -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)

Expand Down

4 changes: 2 additions & 2 deletions
integration/container/health_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ func TestHealthCheckWorkdir(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithTty(true), container.WithWorkingDir("/foo"), func(c *container.TestContainerConfig) {
	cID := container.Run(ctx, t, client, container.WithTty(true), container.WithWorkingDir("/foo"), func(c *container.TestContainerConfig) {
 c.Config.Healthcheck = &containertypes.HealthConfig{
 Test: []string{"CMD-SHELL", "if [ \"$PWD\" = \"/foo\" ]; then exit 0; else exit 1; fi;"},
 Interval: 50 * time.Millisecond,
Expand All@@ -42,7 +42,7 @@ func TestHealthKillContainer(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	id := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
	id := container.Run(ctx, t, client, func(c *container.TestContainerConfig) {
 c.Config.Healthcheck = &containertypes.HealthConfig{
 Test: []string{"CMD-SHELL", "sleep 1"},
 Interval: time.Second,
Expand Down

2 changes: 1 addition & 1 deletion
integration/container/inspect_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestInspectCpusetInConfigPre120(t *testing.T) {

	name := "cpusetinconfig-pre120-" + t.Name()
	// Create container with up to-date-API
	container.Run(t, ctx, request.NewAPIClient(t), container.WithName(name),
	container.Run(ctx, t, request.NewAPIClient(t), container.WithName(name),
 container.WithCmd("true"),
 func(c *container.TestContainerConfig) {
 c.HostConfig.Resources.CpusetCpus = "0"
Expand Down

4 changes: 2 additions & 2 deletions
integration/container/ipcmode_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -308,15 +308,15 @@ 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)
	assert.Check(t, is.Equal(string(inspect.HostConfig.IpcMode), "private"))

	// 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)
Expand Down

16 changes: 8 additions & 8 deletions
integration/container/kill_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ func TestKillContainerInvalidSignal(t *testing.T) {
	defer setupTest(t)()
	client := testEnv.APIClient()
	ctx := context.Background()
	id := container.Run(t, ctx, client)
	id := container.Run(ctx, t, client)

	err := client.ContainerKill(ctx, id, "0")
	assert.Error(t, err, "Error response from daemon: Invalid signal: 0")
Expand DownExpand Up@@ -60,7 +60,7 @@ func TestKillContainer(t *testing.T) {
 tc := tc
 t.Run(tc.doc, func(t *testing.T) {
 ctx := context.Background()
 id := container.Run(t, ctx, client)
 id := container.Run(ctx, t, client)
 err := client.ContainerKill(ctx, id, tc.signal)
 assert.NilError(t, err)

Expand DownExpand Up@@ -95,7 +95,7 @@ func TestKillWithStopSignalAndRestartPolicies(t *testing.T) {
 tc := tc
 t.Run(tc.doc, func(t *testing.T) {
 ctx := context.Background()
 id := container.Run(t, ctx, client,
 id := container.Run(ctx, t, client,
 container.WithRestartPolicy("always"),
 func(c *container.TestContainerConfig) {
 c.Config.StopSignal = tc.stopsignal
Expand All@@ -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"))
Expand All@@ -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)
}
Expand All@@ -137,7 +137,7 @@ func TestKillDifferentUserContainer(t *testing.T) {
	ctx := context.Background()
	client := request.NewAPIClient(t, client.WithVersion("1.19"))

	id := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
	id := container.Run(ctx, t, client, func(c *container.TestContainerConfig) {
 c.Config.User = "daemon"
	})
	poll.WaitOn(t, container.IsInState(ctx, client, id, "running"), poll.WithDelay(100*time.Millisecond))
Expand All@@ -154,7 +154,7 @@ func TestInspectOomKilledTrue(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", "x=a; while true; do x=$x$x$x$x; done"), func(c *container.TestContainerConfig) {
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", "x=a; while true; do x=$x$x$x$x; done"), func(c *container.TestContainerConfig) {
 c.HostConfig.Resources.Memory = 32 * 1024 * 1024
	})

Expand All@@ -172,7 +172,7 @@ func TestInspectOomKilledFalse(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", "echo hello world"))
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", "echo hello world"))

	poll.WaitOn(t, container.IsInState(ctx, client, cID, "exited"), poll.WithDelay(100*time.Millisecond))

Expand Down

6 changes: 3 additions & 3 deletions
integration/container/links_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ func TestLinksEtcHostsContentMatch(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithNetworkMode("host"))
	cID := container.Run(ctx, t, client, container.WithNetworkMode("host"))
	res, err := container.Exec(ctx, client, cID, []string{"cat", "/etc/hosts"})
	assert.NilError(t, err)
	assert.Assert(t, is.Len(res.Stderr(), 0))
Expand All@@ -42,8 +42,8 @@ func TestLinksContainerNames(t *testing.T) {

	containerA := "first_" + t.Name()
	containerB := "second_" + t.Name()
	container.Run(t, ctx, client, container.WithName(containerA))
	container.Run(t, ctx, client, container.WithName(containerB), container.WithLinks(containerA+":"+containerA))
	container.Run(ctx, t, client, container.WithName(containerA))
	container.Run(ctx, t, client, container.WithName(containerB), container.WithLinks(containerA+":"+containerA))

	f := filters.NewArgs(filters.Arg("name", containerA))

Expand Down

2 changes: 1 addition & 1 deletion
integration/container/logs_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ func TestLogsFollowTailEmpty(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	id := container.Run(t, ctx, client, container.WithCmd("sleep", "100000"))
	id := container.Run(ctx, t, client, container.WithCmd("sleep", "100000"))

	logs, err := client.ContainerLogs(ctx, id, types.ContainerLogsOptions{ShowStdout: true, Tail: "2"})
	if logs != nil {
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/mounts_linux_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -256,9 +256,9 @@ func TestContainerBindMountNonRecursive(t *testing.T) {
	ctx := context.Background()
	client := testEnv.APIClient()
	containers := []string{
 container.Run(t, ctx, client, container.WithMount(implicit), container.WithCmd(recursiveVerifier...)),
 container.Run(t, ctx, client, container.WithMount(recursive), container.WithCmd(recursiveVerifier...)),
 container.Run(t, ctx, client, container.WithMount(nonRecursive), container.WithCmd(nonRecursiveVerifier...)),
 container.Run(ctx, t, client, container.WithMount(implicit), container.WithCmd(recursiveVerifier...)),
 container.Run(ctx, t, client, container.WithMount(recursive), container.WithCmd(recursiveVerifier...)),
 container.Run(ctx, t, client, container.WithMount(nonRecursive), container.WithCmd(nonRecursiveVerifier...)),
	}

	for _, c := range containers {
Expand Down

4 changes: 2 additions & 2 deletions
integration/container/nat_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ func TestNetworkLoopbackNat(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String())), container.WithTty(true), container.WithNetworkMode("container:"+serverContainerID))
	cID := container.Run(ctx, t, client, container.WithCmd("sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String())), container.WithTty(true), container.WithNetworkMode("container:"+serverContainerID))

	poll.WaitOn(t, container.IsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond))

Expand All@@ -93,7 +93,7 @@ func startServerContainer(t *testing.T, msg string, port int) string {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client, container.WithName("server-"+t.Name()), container.WithCmd("sh", "-c", fmt.Sprintf("echo %q | nc -lp %d", msg, port)), container.WithExposedPorts(fmt.Sprintf("%d/tcp", port)), func(c *container.TestContainerConfig) {
	cID := container.Run(ctx, t, client, container.WithName("server-"+t.Name()), container.WithCmd("sh", "-c", fmt.Sprintf("echo %q | nc -lp %d", msg, port)), container.WithExposedPorts(fmt.Sprintf("%d/tcp", port)), func(c *container.TestContainerConfig) {
 c.HostConfig.PortBindings = nat.PortMap{
 nat.Port(fmt.Sprintf("%d/tcp", port)): []nat.PortBinding{
 {
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/pause_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ func TestPause(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)
	poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

	since := request.DaemonUnixTime(ctx, t, client, testEnv)
Expand DownExpand Up@@ -57,7 +57,7 @@ func TestPauseFailsOnWindowsServerContainers(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)
	poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

	err := client.ContainerPause(ctx, cID)
Expand All@@ -71,7 +71,7 @@ func TestPauseStopPausedContainer(t *testing.T) {
	client := testEnv.APIClient()
	ctx := context.Background()

	cID := container.Run(t, ctx, client)
	cID := container.Run(ctx, t, client)
	poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))

	err := client.ContainerPause(ctx, cID)
Expand Down

6 changes: 3 additions & 3 deletions
integration/container/ps_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Loading