From ae66b3d2fb2f1f65f6ca8932e8044114e609d0b4 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Mon, 3 Nov 2025 01:49:27 +0900 Subject: message: rename NewMsg to New Should have done this when relocating this from container. Now is a good time to rename it before v0.3.x. Signed-off-by: Ophestra --- system/dbus/dbus_test.go | 8 ++++---- system/system_test.go | 32 ++++++++++++++++---------------- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'system') diff --git a/system/dbus/dbus_test.go b/system/dbus/dbus_test.go index abe324ba..85aae5bf 100644 --- a/system/dbus/dbus_test.go +++ b/system/dbus/dbus_test.go @@ -93,9 +93,9 @@ func testProxyFinaliseStartWaitCloseString(t *testing.T, useSandbox bool) { t.Run("invalid start", func(t *testing.T) { if !useSandbox { - p = dbus.NewDirect(t.Context(), message.NewMsg(nil), nil, nil) + p = dbus.NewDirect(t.Context(), message.New(nil), nil, nil) } else { - p = dbus.New(t.Context(), message.NewMsg(nil), nil, nil) + p = dbus.New(t.Context(), message.New(nil), nil, nil) } if err := p.Start(); !errors.Is(err, syscall.ENOTRECOVERABLE) { @@ -125,9 +125,9 @@ func testProxyFinaliseStartWaitCloseString(t *testing.T, useSandbox bool) { defer cancel() output := new(strings.Builder) if !useSandbox { - p = dbus.NewDirect(ctx, message.NewMsg(nil), final, output) + p = dbus.NewDirect(ctx, message.New(nil), final, output) } else { - p = dbus.New(ctx, message.NewMsg(nil), final, output) + p = dbus.New(ctx, message.New(nil), final, output) } { // check invalid wait behaviour diff --git a/system/system_test.go b/system/system_test.go index 83d97a69..2798787d 100644 --- a/system/system_test.go +++ b/system/system_test.go @@ -82,7 +82,7 @@ func TestNew(t *testing.T) { t.Errorf("recover: %v, want %v", r, want) } }() - New(nil, message.NewMsg(nil), 0) + New(nil, message.New(nil), 0) }) t.Run("msg", func(t *testing.T) { @@ -102,11 +102,11 @@ func TestNew(t *testing.T) { t.Errorf("recover: %v, want %v", r, want) } }() - New(t.Context(), message.NewMsg(nil), -1) + New(t.Context(), message.New(nil), -1) }) }) - sys := New(t.Context(), message.NewMsg(nil), 0xdeadbeef) + sys := New(t.Context(), message.New(nil), 0xdeadbeef) if sys.ctx == nil { t.Error("New: ctx = nil") } @@ -125,51 +125,51 @@ func TestEqual(t *testing.T) { want bool }{ {"simple UID", - New(t.Context(), message.NewMsg(nil), 150), - New(t.Context(), message.NewMsg(nil), 150), + New(t.Context(), message.New(nil), 150), + New(t.Context(), message.New(nil), 150), true}, {"simple UID differ", - New(t.Context(), message.NewMsg(nil), 150), - New(t.Context(), message.NewMsg(nil), 151), + New(t.Context(), message.New(nil), 150), + New(t.Context(), message.New(nil), 151), false}, {"simple UID nil", - New(t.Context(), message.NewMsg(nil), 150), + New(t.Context(), message.New(nil), 150), nil, false}, {"op length mismatch", - New(t.Context(), message.NewMsg(nil), 150). + New(t.Context(), message.New(nil), 150). ChangeHosts("chronos"), - New(t.Context(), message.NewMsg(nil), 150). + New(t.Context(), message.New(nil), 150). ChangeHosts("chronos"). Ensure(m("/run"), 0755), false}, {"op value mismatch", - New(t.Context(), message.NewMsg(nil), 150). + New(t.Context(), message.New(nil), 150). ChangeHosts("chronos"). Ensure(m("/run"), 0644), - New(t.Context(), message.NewMsg(nil), 150). + New(t.Context(), message.New(nil), 150). ChangeHosts("chronos"). Ensure(m("/run"), 0755), false}, {"op type mismatch", - New(t.Context(), message.NewMsg(nil), 150). + New(t.Context(), message.New(nil), 150). ChangeHosts("chronos"). Wayland(m("/proc/nonexistent/dst"), m("/proc/nonexistent/src"), "\x00", "\x00"), - New(t.Context(), message.NewMsg(nil), 150). + New(t.Context(), message.New(nil), 150). ChangeHosts("chronos"). Ensure(m("/run"), 0755), false}, {"op equals", - New(t.Context(), message.NewMsg(nil), 150). + New(t.Context(), message.New(nil), 150). ChangeHosts("chronos"). Ensure(m("/run"), 0755), - New(t.Context(), message.NewMsg(nil), 150). + New(t.Context(), message.New(nil), 150). ChangeHosts("chronos"). Ensure(m("/run"), 0755), true}, -- cgit v1.3.1