sys: add missing pre-condition checks in tests

thaJeztah · thaJeztah · commit 6e727152261b · 2021-04-07T19:16:51.000+02:00
SetOOMScore requires both privileged (root) and non-user namespace,
for negative values, so adjust the pre-conditions accordingly.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/sys/oom_linux_test.go b/sys/oom_linux_test.go
@@ -23,11 +23,13 @@ import (
 	"testing"
 	"time"
 
+	"github.com/containerd/containerd/pkg/userns"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
 )
 
 func TestSetPositiveOomScoreAdjustment(t *testing.T) {
+	// Setting a *positive* OOM score adjust does not require privileged
 	_, adjustment, err := adjustOom(123)
 	if err != nil {
 		t.Error(err)
@@ -37,8 +39,8 @@ func TestSetPositiveOomScoreAdjustment(t *testing.T) {
 }
 
 func TestSetNegativeOomScoreAdjustmentWhenPrivileged(t *testing.T) {
-	if !runningPrivileged() {
-		t.Skip("Needs to be run as root")
+	if !runningPrivileged() || userns.RunningInUserNS() {
+		t.Skip("requires root and not running in user namespace")
 		return
 	}
 
@@ -51,8 +53,8 @@ func TestSetNegativeOomScoreAdjustmentWhenPrivileged(t *testing.T) {
 }
 
 func TestSetNegativeOomScoreAdjustmentWhenUnprivilegedHasNoEffect(t *testing.T) {
-	if runningPrivileged() {
-		t.Skip("Needs to be run as non-root")
+	if runningPrivileged() && !userns.RunningInUserNS() {
+		t.Skip("needs to be run as non-root or in user namespace")
 		return
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,13 @@ import (`
`23`	`23`	`"testing"`
`24`	`24`	`"time"`
`25`	`25`
	`26`	`+ "github.com/containerd/containerd/pkg/userns"`
`26`	`27`	`"gotest.tools/v3/assert"`
`27`	`28`	`is "gotest.tools/v3/assert/cmp"`
`28`	`29`	`)`
`29`	`30`
`30`	`31`	`func TestSetPositiveOomScoreAdjustment(t *testing.T) {`
	`32`	`+ // Setting a positive OOM score adjust does not require privileged`
`31`	`33`	`_, adjustment, err := adjustOom(123)`
`32`	`34`	`if err != nil {`
`33`	`35`	`t.Error(err)`
`@@ -37,8 +39,8 @@ func TestSetPositiveOomScoreAdjustment(t *testing.T) {`
`37`	`39`	`}`
`38`	`40`
`39`	`41`	`func TestSetNegativeOomScoreAdjustmentWhenPrivileged(t *testing.T) {`
`40`		`- if !runningPrivileged() {`
`41`		`- t.Skip("Needs to be run as root")`
	`42`	`+ if !runningPrivileged() \|\| userns.RunningInUserNS() {`
	`43`	`+ t.Skip("requires root and not running in user namespace")`
`42`	`44`	`return`
`43`	`45`	`}`
`44`	`46`
`@@ -51,8 +53,8 @@ func TestSetNegativeOomScoreAdjustmentWhenPrivileged(t *testing.T) {`
`51`	`53`	`}`
`52`	`54`
`53`	`55`	`func TestSetNegativeOomScoreAdjustmentWhenUnprivilegedHasNoEffect(t *testing.T) {`
`54`		`- if runningPrivileged() {`
`55`		`- t.Skip("Needs to be run as non-root")`
	`56`	`+ if runningPrivileged() && !userns.RunningInUserNS() {`
	`57`	`+ t.Skip("needs to be run as non-root or in user namespace")`
`56`	`58`	`return`
`57`	`59`	`}`
`58`	`60`