From 4e7aab07d5b175345fdf3ea08868dab1e6d90126 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Thu, 13 Nov 2025 01:15:19 +0900 Subject: internal/system: relocate from system These packages are highly specific to hakurei and are difficult to use safely from other pieces of code. Their exported symbols are made available until v0.4.0 where they will be removed for #24. Signed-off-by: Ophestra --- system/output_test.go | 140 -------------------------------------------------- 1 file changed, 140 deletions(-) delete mode 100644 system/output_test.go (limited to 'system/output_test.go') diff --git a/system/output_test.go b/system/output_test.go deleted file mode 100644 index c0cbfdfe..00000000 --- a/system/output_test.go +++ /dev/null @@ -1,140 +0,0 @@ -package system - -import ( - "errors" - "net" - "os" - "reflect" - "syscall" - "testing" - - "hakurei.app/container" - "hakurei.app/message" -) - -func TestOpError(t *testing.T) { - t.Parallel() - - testCases := []struct { - name string - err error - s string - is error - isF error - msg string - }{ - {"message", newOpErrorMessage("dbus", ErrDBusConfig, - "attempted to create message bus proxy args without session bus config", false), - "attempted to create message bus proxy args without session bus config", - ErrDBusConfig, syscall.ENOTRECOVERABLE, - "attempted to create message bus proxy args without session bus config"}, - - {"apply", newOpError("tmpfile", syscall.EBADE, false), - "apply tmpfile: invalid exchange", - syscall.EBADE, syscall.EBADF, - "cannot apply tmpfile: invalid exchange"}, - - {"revert", newOpError("wayland", syscall.EBADF, true), - "revert wayland: bad file descriptor", - syscall.EBADF, syscall.EBADE, - "cannot revert wayland: bad file descriptor"}, - - {"path", newOpError("tmpfile", &os.PathError{Op: "stat", Path: "/run/dbus", Err: syscall.EISDIR}, false), - "stat /run/dbus: is a directory", - syscall.EISDIR, syscall.ENOTDIR, - "cannot stat /run/dbus: is a directory"}, - - {"net", newOpError("wayland", &net.OpError{Op: "dial", Net: "unix", Addr: &net.UnixAddr{Name: "/run/user/1000/wayland-1", Net: "unix"}, Err: syscall.ENOENT}, false), - "dial unix /run/user/1000/wayland-1: no such file or directory", - syscall.ENOENT, syscall.EPERM, - "cannot dial unix /run/user/1000/wayland-1: no such file or directory"}, - } - for _, tc := range testCases { - t.Run(tc.name, func(t *testing.T) { - t.Parallel() - - t.Run("error", func(t *testing.T) { - if got := tc.err.Error(); got != tc.s { - t.Errorf("Error: %q, want %q", got, tc.s) - } - }) - - t.Run("is", func(t *testing.T) { - if !errors.Is(tc.err, tc.is) { - t.Error("Is: unexpected false") - } - if errors.Is(tc.err, tc.isF) { - t.Error("Is: unexpected true") - } - }) - - t.Run("msg", func(t *testing.T) { - if got, ok := message.GetMessage(tc.err); !ok { - if tc.msg != "" { - t.Errorf("GetMessage: err does not implement MessageError") - } - return - } else if got != tc.msg { - t.Errorf("GetMessage: %q, want %q", got, tc.msg) - } - }) - }) - } - - t.Run("new", func(t *testing.T) { - if err := newOpError("check", nil, false); err != nil { - t.Errorf("newOpError: %v", err) - } - if err := newOpErrorMessage("check", nil, "", false); err != nil { - t.Errorf("newOpErrorMessage: %v", err) - } - }) -} - -func TestPrintJoinedError(t *testing.T) { - t.Parallel() - - testCases := []struct { - name string - err error - want [][]any - }{ - {"nil", nil, [][]any{{"not a joined error:", nil}}}, - {"single", errors.Join(syscall.EINVAL), [][]any{{"invalid argument"}}}, - - {"unwrapped", syscall.EINVAL, [][]any{{"not a joined error:", syscall.EINVAL}}}, - {"unwrapped message", &OpError{ - Op: "meow", - Err: syscall.EBADFD, - }, [][]any{ - {"cannot apply meow: file descriptor in bad state"}, - }}, - - {"many", errors.Join(syscall.ENOTRECOVERABLE, syscall.ETIMEDOUT, syscall.EBADFD), [][]any{ - {"state not recoverable"}, - {"connection timed out"}, - {"file descriptor in bad state"}, - }}, - {"many message", errors.Join( - &container.StartError{Step: "meow", Err: syscall.ENOMEM}, - &os.PathError{Op: "meow", Path: "/proc/nonexistent", Err: syscall.ENOSYS}, - &os.LinkError{Op: "link", Old: "/etc", New: "/proc/nonexistent", Err: syscall.ENOENT}, - &OpError{Op: "meow", Err: syscall.ENODEV, Revert: true}, - ), [][]any{ - {"cannot meow: cannot allocate memory"}, - {"meow /proc/nonexistent: function not implemented"}, - {"link /etc /proc/nonexistent: no such file or directory"}, - {"cannot revert meow: no such device"}, - }}, - } - for _, tc := range testCases { - t.Run(tc.name, func(t *testing.T) { - t.Parallel() - var got [][]any - printJoinedError(func(v ...any) { got = append(got, v) }, "not a joined error:", tc.err) - if !reflect.DeepEqual(got, tc.want) { - t.Errorf("printJoinedError: %#v, want %#v", got, tc.want) - } - }) - } -} -- cgit v1.3.1