From 9462af08f38fefe40d985383d8825258a6d1f0a8 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sat, 4 Oct 2025 20:27:27 +0900 Subject: system/dbus: dump buffer internally This should have been an implementation detail and should not be up to the caller to call it. Signed-off-by: Ophestra --- system/dbus_test.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'system/dbus_test.go') diff --git a/system/dbus_test.go b/system/dbus_test.go index f20f984a..0f3033a4 100644 --- a/system/dbus_test.go +++ b/system/dbus_test.go @@ -82,10 +82,8 @@ func TestDBusProxyOp(t *testing.T) { Op: "dbus", Err: ErrDBusConfig, Msg: "attempted to create message bus proxy args without session bus config", } - if f, err := sys.ProxyDBus(nil, new(dbus.Config), nil, nil); !reflect.DeepEqual(err, wantErr) { + if err := sys.ProxyDBus(nil, new(dbus.Config), nil, nil); !reflect.DeepEqual(err, wantErr) { t.Errorf("ProxyDBus: error = %v, want %v", err, wantErr) - } else if f != nil { - t.Errorf("ProxyDBus: f = %p", f) } }, nil, stub.Expect{}}, @@ -120,7 +118,7 @@ func TestDBusProxyOp(t *testing.T) { Op: "dbus", Err: stub.UniqueError(0), Msg: "cannot finalise message bus proxy: unique error 0 injected by the test suite", } - if f, err := sys.ProxyDBus( + if err := sys.ProxyDBus( &dbus.Config{ // use impossible value here as an implicit assert that it goes through the stub Talk: []string{"session\x00"}, Filter: true, @@ -131,8 +129,6 @@ func TestDBusProxyOp(t *testing.T) { m("/tmp/hakurei.0/99dd71ee2146369514e0d10783368f8f/bus"), m("/tmp/hakurei.0/99dd71ee2146369514e0d10783368f8f/system_bus_socket")); !reflect.DeepEqual(err, wantErr) { t.Errorf("ProxyDBus: error = %v", err) - } else if f != nil { - t.Errorf("ProxyDBus: f = %p", f) } }, nil, stub.Expect{Calls: []stub.Call{ call("dbusAddress", stub.ExpectArgs{}, [2]string{"unix:path=/run/user/1000/bus", "unix:path=/run/dbus/system_bus_socket"}, nil), -- cgit v1.3.1