Merge pull request #98960 from BenTheElder/oom-test-v2

fix TestPidListerFailure on cgroupsv2
kubernetes · Feb 20, 2021 · 03b0ec9 · 03b0ec9
2 parents 0b5dd00 + 0156eb1
commit 03b0ec9
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkg/util/oom/oom_linux_test.go b/pkg/util/oom/oom_linux_test.go
@@ -19,6 +19,8 @@ limitations under the License.
 package oom
 
 import (
+	"os"
+
 	"github.com/opencontainers/runc/libcontainer/cgroups"
 	"testing"
 
@@ -100,5 +102,5 @@ func TestOOMScoreAdjContainer(t *testing.T) {
 
 func TestPidListerFailure(t *testing.T) {
 	_, err := getPids("/does/not/exist")
-	assert.True(t, cgroups.IsNotFound(err), "expected getPids to return not exists error. Got %v", err)
+	assert.True(t, cgroups.IsNotFound(err) || os.IsNotExist(err), "expected getPids to return not exists error. Got %v", err)
 }