diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-08-29 22:12:21 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-08-29 22:12:21 +0900 |
| commit | d7c7c69a13868546c26c3e5096fca09304a6e182 (patch) | |
| tree | 0fb383109f03be3024e0d140454ee866572f393b /container | |
| parent | 50972096cd8bffd9b17dbdf656ec34c48edb8f86 (diff) | |
container/dispatcher: check simple test errors via reflect
Again, avoids the errors package concealing unexpected behaviours.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'container')
| -rw-r--r-- | container/dispatcher_test.go | 2 | ||||
| -rw-r--r-- | container/mount_test.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/container/dispatcher_test.go b/container/dispatcher_test.go index 74d77f46..69d698ac 100644 --- a/container/dispatcher_test.go +++ b/container/dispatcher_test.go @@ -115,7 +115,7 @@ func checkSimple(t *testing.T, fname string, testCases []simpleTestCase) { t.Run(tc.name, func(t *testing.T) { defer handleExitStub() k := &kstub{t: t, want: tc.want, wg: new(sync.WaitGroup)} - if err := tc.f(k); !errors.Is(err, tc.wantErr) { + if err := tc.f(k); !reflect.DeepEqual(err, tc.wantErr) { t.Errorf("%s: error = %v, want %v", fname, err, tc.wantErr) } k.handleIncomplete(func(k *kstub) { diff --git a/container/mount_test.go b/container/mount_test.go index f2f8e29b..cf21e81f 100644 --- a/container/mount_test.go +++ b/container/mount_test.go @@ -90,7 +90,7 @@ func TestRemount(t *testing.T) { }, [][]kexpect{{ {"evalSymlinks", expectArgs{"/sysroot/nix"}, "/sysroot/nix", nil}, {"open", expectArgs{"/sysroot/nix", 0x280000, uint32(0)}, 0xdeadbeef, errUnique}, - }}, errUnique}, + }}, &os.PathError{Op: "open", Path: "/sysroot/nix", Err: errUnique}}, {"readlink", func(k syscallDispatcher) error { return newProcPaths(k, hostPath).remount("/sysroot/nix", syscall.MS_REC|syscall.MS_RDONLY|syscall.MS_NODEV) @@ -107,7 +107,7 @@ func TestRemount(t *testing.T) { {"open", expectArgs{"/sysroot/nix", 0x280000, uint32(0)}, 0xdeadbeef, nil}, {"readlink", expectArgs{"/host/proc/self/fd/3735928559"}, "/sysroot/nix", nil}, {"close", expectArgs{0xdeadbeef}, nil, errUnique}, - }}, errUnique}, + }}, &os.PathError{Op: "close", Path: "/sysroot/nix", Err: errUnique}}, {"mountinfo no match", func(k syscallDispatcher) error { return newProcPaths(k, hostPath).remount("/sysroot/nix", syscall.MS_REC|syscall.MS_RDONLY|syscall.MS_NODEV) |