github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Allow oom adj test to run in environments with a score

Browse Source 
GitHub Actions process wrapper sets score adj to 500 for any process;
the OOM score adj test expected default adj to be 0 during test.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
This commit is contained in:
Phil Estes 2020-11-10 10:55:00 -05:00
parent c11472d31d
commit af2fb4eb77
No known key found for this signature in database
GPG Key ID: 0F386284C03A1162
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/oom_unix_test.go
View File

@ -30,7 +30,7 @@ import (
)
func TestSetPositiveOomScoreAdjustment(t *testing.T) {
adjustment, err := adjustOom(123)
_, adjustment, err := adjustOom(123)
if err != nil {
t.Error(err)
return
@ -44,7 +44,7 @@ func TestSetNegativeOomScoreAdjustmentWhenPrivileged(t *testing.T) {
return
}
adjustment, err := adjustOom(-123)
_, adjustment, err := adjustOom(-123)
if err != nil {
t.Error(err)
return
@ -58,32 +58,37 @@ func TestSetNegativeOomScoreAdjustmentWhenUnprivilegedHasNoEffect(t *testing.T)
return
}
adjustment, err := adjustOom(-123)
initial, adjustment, err := adjustOom(-123)
if err != nil {
t.Error(err)
return
}
assert.Check(t, is.Equal(adjustment, 0))
assert.Check(t, is.Equal(adjustment, initial))
}
func adjustOom(adjustment int) (int, error) {
func adjustOom(adjustment int) (int, int, error) {
cmd := exec.Command("sleep", "100")
if err := cmd.Start(); err != nil {
return 0, err
return 0, 0, err
}
defer cmd.Process.Kill()
pid, err := waitForPid(cmd.Process)
if err != nil {
return 0, err
return 0, 0, err
}
initial, err := GetOOMScoreAdj(pid)
if err != nil {
return 0, 0, err
}
if err := SetOOMScore(pid, adjustment); err != nil {
return 0, err
return 0, 0, err
}
return GetOOMScoreAdj(pid)
adj, err := GetOOMScoreAdj(pid)
return initial, adj, err
}
func waitForPid(process *os.Process) (int, error) {