Merge pull request #49105 from thaJeztah/27.x_backport_testing-suse-apparmor

thaJeztah · web-flow · commit 135b1449cdd5 · 2024-12-16T18:17:10.000+01:00
[27.x backport] integration-cli: don't skip AppArmor tests on SLES
diff --git a/integration-cli/requirements_test.go b/integration-cli/requirements_test.go
@@ -79,9 +79,6 @@ func Network() bool {
 }
 
 func Apparmor() bool {
-	if strings.HasPrefix(testEnv.DaemonInfo.OperatingSystem, "SUSE Linux Enterprise Server ") {
-		return false
-	}
 	buf, err := os.ReadFile("/sys/module/apparmor/parameters/enabled")
 	return err == nil && len(buf) > 1 && buf[0] == 'Y'
 }

Original file line number	Diff line number	Diff line change
`@@ -79,9 +79,6 @@ func Network() bool {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`func Apparmor() bool {`
`82`		`- if strings.HasPrefix(testEnv.DaemonInfo.OperatingSystem, "SUSE Linux Enterprise Server ") {`
`83`		`- return false`
`84`		`- }`
`85`	`82`	`buf, err := os.ReadFile("/sys/module/apparmor/parameters/enabled")`
`86`	`83`	`return err == nil && len(buf) > 1 && buf[0] == 'Y'`
`87`	`84`	`}`