aboutsummaryrefslogtreecommitdiffhomepage
path: root/container/dispatcher_test.go
diff options
context:
space:
mode:
authorOphestra <cat@gensokyo.uk>2025-08-25 17:33:35 +0900
committerOphestra <cat@gensokyo.uk>2025-08-25 17:33:35 +0900
commit8db906ee64a1ce9d1fd602d161d0681d2a6ba27d (patch)
tree3c74cba5607ecd8950be27e7ccbe1c6741619a0a /container/dispatcher_test.go
parentcedfceded548ef3b8d80b4e46e64dbaa9de8bd93 (diff)
container/dispatcher: remove exit stub test log
Turns out testing.T does not like being called in defer. Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'container/dispatcher_test.go')
-rw-r--r--container/dispatcher_test.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/container/dispatcher_test.go b/container/dispatcher_test.go
index 61a091d6..54a99873 100644
--- a/container/dispatcher_test.go
+++ b/container/dispatcher_test.go
@@ -113,7 +113,7 @@ type simpleTestCase struct {
func checkSimple(t *testing.T, fname string, testCases []simpleTestCase) {
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
- defer handleExitStub(t, "check")
+ defer handleExitStub()
k := &kstub{t: t, want: tc.want, wg: new(sync.WaitGroup)}
if err := tc.f(k); !errors.Is(err, tc.wantErr) {
t.Errorf("%s: error = %v, want %v", fname, err, tc.wantErr)
@@ -141,6 +141,7 @@ func checkOpBehaviour(t *testing.T, testCases []opBehaviourTestCase) {
t.Run("behaviour", func(t *testing.T) {
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
+ defer handleExitStub()
state := &setupState{Params: tc.params}
k := &kstub{t: t, want: [][]kexpect{slices.Concat(tc.early, []kexpect{{name: "\x00"}}, tc.apply)}, wg: new(sync.WaitGroup)}
errEarly := tc.op.early(state, k)
@@ -265,10 +266,9 @@ func (k *kexpect) error(ok ...bool) error {
return syscall.ENOTRECOVERABLE
}
-func handleExitStub(t *testing.T, prefix string) {
+func handleExitStub() {
r := recover()
if r == 0xdeadbeef {
- t.Log(prefix + " terminated on an exit stub")
return
}
if r != nil {
@@ -359,7 +359,7 @@ func (k *kstub) new(f func(k syscallDispatcher)) {
k.wg.Add(1)
go func() {
defer k.wg.Done()
- defer handleExitStub(k.t, "goroutine")
+ defer handleExitStub()
f(sk)
}()
}