diff --git a/cmd/nerdctl/container/container_logs_test.go b/cmd/nerdctl/container/container_logs_test.go index ec9fbd2ce70..17cb4438db5 100644 --- a/cmd/nerdctl/container/container_logs_test.go +++ b/cmd/nerdctl/container/container_logs_test.go @@ -82,6 +82,7 @@ func TestLogsOutStreamsSeparated(t *testing.T) { } func TestLogsWithInheritedFlags(t *testing.T) { + // Seen flaky with Docker t.Parallel() base := testutil.NewBase(t) for k, v := range base.Args { diff --git a/cmd/nerdctl/image/image_inspect_test.go b/cmd/nerdctl/image/image_inspect_test.go index 93278de9294..37e5a3a4b73 100644 --- a/cmd/nerdctl/image/image_inspect_test.go +++ b/cmd/nerdctl/image/image_inspect_test.go @@ -18,6 +18,7 @@ package image import ( "encoding/json" + "runtime" "strings" "testing" @@ -64,6 +65,10 @@ func TestImageInspectSimpleCases(t *testing.T) { }, } + if runtime.GOOS == "windows" { + testCase.Require = nerdtest.IsFlaky("https://github.com/containerd/nerdctl/issues/3524") + } + testCase.Run(t) } diff --git a/cmd/nerdctl/image/image_save_test.go b/cmd/nerdctl/image/image_save_test.go index 23860cf443e..eb2617a1eb3 100644 --- a/cmd/nerdctl/image/image_save_test.go +++ b/cmd/nerdctl/image/image_save_test.go @@ -19,6 +19,7 @@ package image import ( "os" "path/filepath" + "runtime" "strings" "testing" @@ -70,6 +71,10 @@ func TestSave(t *testing.T) { // See https://github.com/containerd/nerdctl/issues/3425 and others for details. testCase.Require = nerdtest.Private + if runtime.GOOS == "windows" { + testCase.Require = nerdtest.IsFlaky("https://github.com/containerd/nerdctl/issues/3524") + } + testCase.SubTests = []*test.Case{ { Description: "Single image, by id", diff --git a/cmd/nerdctl/ipfs/ipfs_compose_linux_test.go b/cmd/nerdctl/ipfs/ipfs_compose_linux_test.go index 5c4cd76fd66..578e134c116 100644 --- a/cmd/nerdctl/ipfs/ipfs_compose_linux_test.go +++ b/cmd/nerdctl/ipfs/ipfs_compose_linux_test.go @@ -46,6 +46,7 @@ func TestIPFSCompNoBuild(t *testing.T) { test.Not(nerdtest.Docker), nerdtest.Registry, nerdtest.IPFS, + nerdtest.IsFlaky("https://github.com/containerd/nerdctl/issues/3510"), // See note below // nerdtest.Private, ) @@ -152,6 +153,7 @@ services: WORDPRESS_DB_USER: exampleuser WORDPRESS_DB_PASSWORD: examplepass WORDPRESS_DB_NAME: exampledb + # FIXME: this is flaky and will make the container fail on occasions volumes: - wordpress:/var/www/html