sys: use assert for error checks in OOM tests

thaJeztah · thaJeztah · commit ace1912bbaf4 · 2021-04-07T19:16:53.000+02:00
Slightly easier to read, and we were already using assert in this file

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
@@ -31,10 +31,7 @@ import (
 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)
-		return
-	}
+	assert.NilError(t, err)
 	assert.Check(t, is.Equal(adjustment, 123))
 }
 
@@ -45,10 +42,7 @@ func TestSetNegativeOomScoreAdjustmentWhenPrivileged(t *testing.T) {
 	}
 
 	_, adjustment, err := adjustOom(-123)
-	if err != nil {
-		t.Error(err)
-		return
-	}
+	assert.NilError(t, err)
 	assert.Check(t, is.Equal(adjustment, -123))
 }
 
@@ -59,10 +53,7 @@ func TestSetNegativeOomScoreAdjustmentWhenUnprivilegedHasNoEffect(t *testing.T)
 	}
 
 	initial, adjustment, err := adjustOom(-123)
-	if err != nil {
-		t.Error(err)
-		return
-	}
+	assert.NilError(t, err)
 	assert.Check(t, is.Equal(adjustment, initial))
 }
 

Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,7 @@ import (`
`31`	`31`	`func TestSetPositiveOomScoreAdjustment(t *testing.T) {`
`32`	`32`	`// Setting a positive OOM score adjust does not require privileged`
`33`	`33`	`_, adjustment, err := adjustOom(123)`
`34`		`- if err != nil {`
`35`		`- t.Error(err)`
`36`		`- return`
`37`		`- }`
	`34`	`+ assert.NilError(t, err)`
`38`	`35`	`assert.Check(t, is.Equal(adjustment, 123))`
`39`	`36`	`}`
`40`	`37`
`@@ -45,10 +42,7 @@ func TestSetNegativeOomScoreAdjustmentWhenPrivileged(t *testing.T) {`
`45`	`42`	`}`
`46`	`43`
`47`	`44`	`_, adjustment, err := adjustOom(-123)`
`48`		`- if err != nil {`
`49`		`- t.Error(err)`
`50`		`- return`
`51`		`- }`
	`45`	`+ assert.NilError(t, err)`
`52`	`46`	`assert.Check(t, is.Equal(adjustment, -123))`
`53`	`47`	`}`
`54`	`48`
`@@ -59,10 +53,7 @@ func TestSetNegativeOomScoreAdjustmentWhenUnprivilegedHasNoEffect(t *testing.T)`
`59`	`53`	`}`
`60`	`54`
`61`	`55`	`initial, adjustment, err := adjustOom(-123)`
`62`		`- if err != nil {`
`63`		`- t.Error(err)`
`64`		`- return`
`65`		`- }`
	`56`	`+ assert.NilError(t, err)`
`66`	`57`	`assert.Check(t, is.Equal(adjustment, initial))`
`67`	`58`	`}`
`68`	`59`