mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4371 from kolyshkin/simplify

Browse Source 
libct/int/seccomp_test: simplify exit code checks
This commit is contained in:
Akihiro Suda
2024-08-14 12:28:08 +09:00
committed by GitHub
parent 6602681d52 2c398bb41d
commit e531ebbca8
1 changed files with 6 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/integration/seccomp_test.go
+6 -39
View File
@@ -52,19 +52,8 @@ func TestSeccompDenySyslogWithErrno(t *testing.T) {
if err == nil {
t.Fatal("Expecting error (negative return code); instead exited cleanly!")
}
var exitCode int
status := ps.Sys().(syscall.WaitStatus)
if status.Exited() {
exitCode = status.ExitStatus()
} else if status.Signaled() {
exitCode = -int(status.Signal())
} else {
t.Fatalf("Unrecognized exit reason!")
}
if exitCode == 0 {
t.Fatalf("dmesg should fail with negative exit code, instead got %d!", exitCode)
if ps.Success() {
t.Fatal("dmesg should fail with negative exit code, instead got 0!")
}
expected := "dmesg: klogctl: No such process"
@@ -111,19 +100,8 @@ func TestSeccompDenySyslog(t *testing.T) {
if err == nil {
t.Fatal("Expecting error (negative return code); instead exited cleanly!")
}
var exitCode int
status := ps.Sys().(syscall.WaitStatus)
if status.Exited() {
exitCode = status.ExitStatus()
} else if status.Signaled() {
exitCode = -int(status.Signal())
} else {
t.Fatalf("Unrecognized exit reason!")
}
if exitCode == 0 {
t.Fatalf("dmesg should fail with negative exit code, instead got %d!", exitCode)
if ps.Success() {
t.Fatal("dmesg should fail with negative exit code, instead got 0!")
}
expected := "dmesg: klogctl: Operation not permitted"
@@ -230,19 +208,8 @@ func TestSeccompDenyWriteConditional(t *testing.T) {
if err == nil {
t.Fatal("Expecting negative return, instead got 0!")
}
var exitCode int
status := ps.Sys().(syscall.WaitStatus)
if status.Exited() {
exitCode = status.ExitStatus()
} else if status.Signaled() {
exitCode = -int(status.Signal())
} else {
t.Fatalf("Unrecognized exit reason!")
}
if exitCode == 0 {
t.Fatalf("Busybox should fail with negative exit code, instead got %d!", exitCode)
if ps.Success() {
t.Fatal("Busybox should fail with negative exit code, instead got 0!")
}
// We're denying write to stderr, so we expect an empty buffer