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

fix TestPidListerFailure on cgroupsv2
This commit is contained in:
Kubernetes Prow Robot 2021-02-19 22:17:41 -08:00 committed by GitHub
commit 03b0ec955a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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)
}