Skip to content

Commit

Permalink
Mark flaky tests
Browse files Browse the repository at this point in the history
Signed-off-by: apostasie <[email protected]>
  • Loading branch information
apostasie committed Oct 15, 2024
1 parent 49049c1 commit 2fc84d7
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 0 deletions.
1 change: 1 addition & 0 deletions cmd/nerdctl/container/container_logs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 5 additions & 0 deletions cmd/nerdctl/image/image_inspect_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package image

import (
"encoding/json"
"runtime"
"strings"
"testing"

Expand Down Expand Up @@ -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)
}

Expand Down
5 changes: 5 additions & 0 deletions cmd/nerdctl/image/image_save_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package image
import (
"os"
"path/filepath"
"runtime"
"strings"
"testing"

Expand Down Expand Up @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions cmd/nerdctl/ipfs/ipfs_compose_linux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 2fc84d7

Please sign in to comment.