security/fortify
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 35 Wiki Activity

test/sandbox/assert: wrap printf
All checks were successful
Test / Create distribution (push) Successful in 26s
Details
Test / Fortify (push) Successful in 2m34s
Details
Test / Data race detector (push) Successful in 3m30s
Details
Test / Fpkg (push) Successful in 3m38s
Details
Test / Flake checks (push) Successful in 50s
Details

Browse Source 
Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra 2025-03-02 18:37:46 +09:00
parent d8e9d71f87
commit 0d3652b793
Signed by: cat
SSH Key Fingerprint: SHA256:gQ67O0enBZ7UdZypgtspB2FDM1g3GVw8nX0XSdcFw8Q
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/sandbox/assert.go
View File

@ -8,9 +8,11 @@ import (
var ( var (
assert = log.New(os.Stderr, "sandbox: ", 0) assert = log.New(os.Stderr, "sandbox: ", 0)
printfFunc = assert.Printf
fatalfFunc = assert.Fatalf fatalfFunc = assert.Fatalf
) )
func printf(format string, v ...any) { printfFunc(format, v...) }
func fatalf(format string, v ...any) { fatalfFunc(format, v...) } func fatalf(format string, v ...any) { fatalfFunc(format, v...) }
func MustAssertMounts(name, hostMountsFile, wantFile string) { func MustAssertMounts(name, hostMountsFile, wantFile string) {
@ -53,7 +55,7 @@ func MustAssertMounts(name, hostMountsFile, wantFile string) {
e, &want[i]) e, &want[i])
} }
assert.Printf("%s", e) printf("%s", e)
i++ i++
}); err != nil { }); err != nil {
fatalf("cannot iterate mounts: %v", err) fatalf("cannot iterate mounts: %v", err)

5
test/sandbox/assert_test.go
View File

@ -1,3 +1,6 @@
package sandbox package sandbox
func ReplaceFatal(f func(format string, v ...any)) { fatalfFunc = f } type F func(format string, v ...any)
func SwapPrint(f F) (old F) { old = printfFunc; printfFunc = f; return }
func SwapFatal(f F) (old F) { old = fatalfFunc; fatalfFunc = f; return }

3
test/sandbox/mount_test.go
View File

@ -111,7 +111,8 @@ overlay /.fortify/sbin/fortify overlay ro,nosuid,nodev,relatime,lowerdir=/mnt-ro
}) })
t.Run(tc.name+" assert", func(t *testing.T) { t.Run(tc.name+" assert", func(t *testing.T) {
sandbox.ReplaceFatal(t.Fatalf) oldFatal := sandbox.SwapFatal(t.Fatalf)
t.Cleanup(func() { sandbox.SwapFatal(oldFatal) })
wantFile := path.Join(t.TempDir(), "want.json") wantFile := path.Join(t.TempDir(), "want.json")
if f, err := os.OpenFile(wantFile, os.O_CREATE|os.O_WRONLY, 0400); err != nil { if f, err := os.OpenFile(wantFile, os.O_CREATE|os.O_WRONLY, 0400); err != nil {