Merge pull request #9829 from mxpv/fp

Run failpoints tests only for runc
This commit is contained in:
Fu Wei 2024-02-16 06:10:08 +00:00 committed by GitHub
commit dc88cdea1b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions

View File

@ -1426,8 +1426,8 @@ func TestShimOOMScore(t *testing.T) {
// status after container.NewTask. It's used to simulate that the runc-init // status after container.NewTask. It's used to simulate that the runc-init
// might be killed by oom-kill. // might be killed by oom-kill.
func TestIssue9103(t *testing.T) { func TestIssue9103(t *testing.T) {
if os.Getenv("RUNC_FLAVOR") == "crun" { if f := os.Getenv("RUNC_FLAVOR"); f != "" && f != "runc" {
t.Skip("skip it when using crun") t.Skip("test requires runc")
} }
client, err := newClient(t, address) client, err := newClient(t, address)

View File

@ -795,8 +795,8 @@ func TestKillContainerDeletedByRunc(t *testing.T) {
// We skip this case when runtime is crun. // We skip this case when runtime is crun.
// More information in https://github.com/containerd/containerd/pull/4214#discussion_r422769497 // More information in https://github.com/containerd/containerd/pull/4214#discussion_r422769497
if os.Getenv("RUNC_FLAVOR") == "crun" { if f := os.Getenv("RUNC_FLAVOR"); f != "" && f != "runc" {
t.Skip("skip it when using crun") t.Skip("test requires runc")
} }
client, err := newClient(t, address) client, err := newClient(t, address)