From 4d9560d6df3c47b7891ca9b8b3b29d727e75ef6f Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 22 Oct 2024 00:16:26 +0900 Subject: [PATCH] integration: add wait Cherry-picked several WIP commits from https://github.com/moby/moby/commits/b0a592798f4d9d7162f8aedca89ada3a29d60e2c/ Originally-authored-by: Rodrigo Campos Co-Authored-by: Kir Kolyshkin Signed-off-by: Akihiro Suda Signed-off-by: Kir Kolyshkin Signed-off-by: Sebastiaan van Stijn (cherry picked from commit fb6e650ab9dec7f9e8a67b278104881f03f63d08) Signed-off-by: Austin Vazquez --- integration/build/build_squash_test.go | 3 ++ integration/build/build_userns_linux_test.go | 3 ++ integration/container/cdi_test.go | 2 + integration/container/diff_test.go | 1 + integration/container/nat_test.go | 44 +++++++++++++++----- integration/image/commit_test.go | 4 +- integration/plugin/logging/read_test.go | 3 ++ 7 files changed, 49 insertions(+), 11 deletions(-) diff --git a/integration/build/build_squash_test.go b/integration/build/build_squash_test.go index 2a2d034e4d..c7a4a8ced2 100644 --- a/integration/build/build_squash_test.go +++ b/integration/build/build_squash_test.go @@ -16,6 +16,7 @@ import ( "github.com/docker/docker/testutil/fakecontext" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" + "gotest.tools/v3/poll" "gotest.tools/v3/skip" ) @@ -85,6 +86,8 @@ func TestBuildSquashParent(t *testing.T) { container.WithImage(name), container.WithCmd("/bin/sh", "-c", "cat /hello"), ) + + poll.WaitOn(t, container.IsStopped(ctx, client, cid)) reader, err := client.ContainerLogs(ctx, cid, containertypes.LogsOptions{ ShowStdout: true, }) diff --git a/integration/build/build_userns_linux_test.go b/integration/build/build_userns_linux_test.go index e4d56a6302..cafb6fc690 100644 --- a/integration/build/build_userns_linux_test.go +++ b/integration/build/build_userns_linux_test.go @@ -18,6 +18,7 @@ import ( "github.com/docker/docker/testutil/fakecontext" "github.com/docker/docker/testutil/fixtures/load" "gotest.tools/v3/assert" + "gotest.tools/v3/poll" "gotest.tools/v3/skip" ) @@ -117,6 +118,8 @@ func TestBuildUserNamespaceValidateCapabilitiesAreV2(t *testing.T) { container.WithImage(imageTag), container.WithCmd("/sbin/getcap", "-n", "/bin/sleep"), ) + + poll.WaitOn(t, container.IsStopped(ctx, clientNoUserRemap, cid)) logReader, err := clientNoUserRemap.ContainerLogs(ctx, cid, containertypes.LogsOptions{ ShowStdout: true, }) diff --git a/integration/container/cdi_test.go b/integration/container/cdi_test.go index 8e837dc5a7..415a31faaa 100644 --- a/integration/container/cdi_test.go +++ b/integration/container/cdi_test.go @@ -16,6 +16,7 @@ import ( "github.com/docker/docker/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" + "gotest.tools/v3/poll" "gotest.tools/v3/skip" ) @@ -54,6 +55,7 @@ func TestCreateWithCDIDevices(t *testing.T) { } assert.Check(t, is.DeepEqual(inspect.HostConfig.DeviceRequests, expectedRequests)) + poll.WaitOn(t, container.IsStopped(ctx, apiClient, id)) reader, err := apiClient.ContainerLogs(ctx, id, containertypes.LogsOptions{ ShowStdout: true, }) diff --git a/integration/container/diff_test.go b/integration/container/diff_test.go index 29068c2513..e1af08b953 100644 --- a/integration/container/diff_test.go +++ b/integration/container/diff_test.go @@ -23,6 +23,7 @@ func TestDiff(t *testing.T) { {Kind: containertypes.ChangeAdd, Path: "/foo/bar"}, } + poll.WaitOn(t, container.IsStopped(ctx, apiClient, cID)) items, err := apiClient.ContainerDiff(ctx, cID) assert.NilError(t, err) assert.DeepEqual(t, expected, items) diff --git a/integration/container/nat_test.go b/integration/container/nat_test.go index 9506430dd3..5219548fc5 100644 --- a/integration/container/nat_test.go +++ b/integration/container/nat_test.go @@ -6,6 +6,7 @@ import ( "fmt" "io" "net" + "strconv" "strings" "testing" "time" @@ -25,13 +26,25 @@ func TestNetworkNat(t *testing.T) { ctx := setupTest(t) - msg := "it works" - startServerContainer(ctx, t, msg, 8080) + const msg = "it works" + const port = 8080 + startServerContainer(ctx, t, msg, port) endpoint := getExternalAddress(t) - conn, err := net.Dial("tcp", net.JoinHostPort(endpoint.String(), "8080")) - assert.NilError(t, err) - defer conn.Close() + + var conn net.Conn + addr := net.JoinHostPort(endpoint.String(), strconv.Itoa(port)) + poll.WaitOn(t, func(t poll.LogT) poll.Result { + var err error + conn, err = net.Dial("tcp", addr) + if err != nil { + return poll.Continue("waiting for %s to be accessible: %v", addr, err) + } + return poll.Success() + }) + defer func() { + assert.Check(t, conn.Close()) + }() data, err := io.ReadAll(conn) assert.NilError(t, err) @@ -43,12 +56,23 @@ func TestNetworkLocalhostTCPNat(t *testing.T) { ctx := setupTest(t) - msg := "hi yall" - startServerContainer(ctx, t, msg, 8081) + const msg = "hi yall" + const port = 8081 + startServerContainer(ctx, t, msg, port) - conn, err := net.Dial("tcp", "localhost:8081") - assert.NilError(t, err) - defer conn.Close() + var conn net.Conn + addr := net.JoinHostPort("localhost", strconv.Itoa(port)) + poll.WaitOn(t, func(t poll.LogT) poll.Result { + var err error + conn, err = net.Dial("tcp", addr) + if err != nil { + return poll.Continue("waiting for %s to be accessible: %v", addr, err) + } + return poll.Success() + }) + defer func() { + assert.Check(t, conn.Close()) + }() data, err := io.ReadAll(conn) assert.NilError(t, err) diff --git a/integration/image/commit_test.go b/integration/image/commit_test.go index 160b4b0199..408a397d56 100644 --- a/integration/image/commit_test.go +++ b/integration/image/commit_test.go @@ -10,6 +10,7 @@ import ( "github.com/docker/docker/testutil/daemon" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" + "gotest.tools/v3/poll" "gotest.tools/v3/skip" ) @@ -61,7 +62,8 @@ func TestUsernsCommit(t *testing.T) { clientUserRemap := dUserRemap.NewClientT(t) defer clientUserRemap.Close() - container.Run(ctx, t, clientUserRemap, container.WithName(t.Name()), container.WithImage("busybox"), container.WithCmd("sh", "-c", "echo hello world > /hello.txt && chown 1000:1000 /hello.txt")) + cID := container.Run(ctx, t, clientUserRemap, container.WithName(t.Name()), container.WithImage("busybox"), container.WithCmd("sh", "-c", "echo hello world > /hello.txt && chown 1000:1000 /hello.txt")) + poll.WaitOn(t, container.IsStopped(ctx, clientUserRemap, cID)) img, err := clientUserRemap.ContainerCommit(ctx, t.Name(), containertypes.CommitOptions{}) assert.NilError(t, err) diff --git a/integration/plugin/logging/read_test.go b/integration/plugin/logging/read_test.go index cb88e6c056..2bee71b09e 100644 --- a/integration/plugin/logging/read_test.go +++ b/integration/plugin/logging/read_test.go @@ -9,10 +9,12 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" + testContainer "github.com/docker/docker/integration/internal/container" "github.com/docker/docker/pkg/stdcopy" "github.com/docker/docker/testutil" "github.com/docker/docker/testutil/daemon" "gotest.tools/v3/assert" + "gotest.tools/v3/poll" ) // TestReadPluginNoRead tests that reads are supported even if the plugin isn't capable. @@ -65,6 +67,7 @@ func TestReadPluginNoRead(t *testing.T) { err = client.ContainerStart(ctx, c.ID, container.StartOptions{}) assert.Assert(t, err) + poll.WaitOn(t, testContainer.IsStopped(ctx, client, c.ID)) logs, err := client.ContainerLogs(ctx, c.ID, container.LogsOptions{ShowStdout: true}) if !test.logsSupported { assert.Assert(t, err != nil)