From 7cf8a00c773bdd6f8b8db95e57fd3e06d3372e4b Mon Sep 17 00:00:00 2001 From: Maksym Pavlenko Date: Thu, 15 Feb 2024 10:28:58 -0800 Subject: [PATCH] Run failpoints tests only for runc Signed-off-by: Maksym Pavlenko --- integration/client/container_linux_test.go | 4 ++-- integration/client/container_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go index fb7d6427b..e37386a10 100644 --- a/integration/client/container_linux_test.go +++ b/integration/client/container_linux_test.go @@ -1426,8 +1426,8 @@ func TestShimOOMScore(t *testing.T) { // status after container.NewTask. It's used to simulate that the runc-init // might be killed by oom-kill. func TestIssue9103(t *testing.T) { - if os.Getenv("RUNC_FLAVOR") == "crun" { - t.Skip("skip it when using crun") + if f := os.Getenv("RUNC_FLAVOR"); f != "" && f != "runc" { + t.Skip("test requires runc") } client, err := newClient(t, address) diff --git a/integration/client/container_test.go b/integration/client/container_test.go index ce831e062..93aaa9d4a 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -795,8 +795,8 @@ func TestKillContainerDeletedByRunc(t *testing.T) { // We skip this case when runtime is crun. // More information in https://github.com/containerd/containerd/pull/4214#discussion_r422769497 - if os.Getenv("RUNC_FLAVOR") == "crun" { - t.Skip("skip it when using crun") + if f := os.Getenv("RUNC_FLAVOR"); f != "" && f != "runc" { + t.Skip("test requires runc") } client, err := newClient(t, address)