system/dbus: drop proxy output beyond threshold
All checks were successful
Test / Create distribution (push) Successful in 33s
Test / Sandbox (push) Successful in 2m13s
Test / Hakurei (push) Successful in 3m5s
Test / Hpkg (push) Successful in 4m12s
Test / Sandbox (race detector) (push) Successful in 4m31s
Test / Hakurei (race detector) (push) Successful in 5m5s
Test / Flake checks (push) Successful in 1m27s
All checks were successful
Test / Create distribution (push) Successful in 33s
Test / Sandbox (push) Successful in 2m13s
Test / Hakurei (push) Successful in 3m5s
Test / Hpkg (push) Successful in 4m12s
Test / Sandbox (race detector) (push) Successful in 4m31s
Test / Hakurei (race detector) (push) Successful in 5m5s
Test / Flake checks (push) Successful in 1m27s
This prevents xdg-dbus-proxy from running the priv process out of memory. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
parent
ecaf43358d
commit
a9def08533
SSH Key Fingerprint:
SHA256:gQ67O0enBZ7UdZypgtspB2FDM1g3GVw8nX0XSdcFw8Q
@ -7,6 +7,7 @@ import (
|
||||
"fmt"
|
||||
"log"
|
||||
"reflect"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
"syscall"
|
||||
@ -44,7 +45,7 @@ func (sys *I) ProxyDBus(session, system *dbus.Config, sessionPath, systemPath st
|
||||
var sessionBus, systemBus dbus.ProxyPair
|
||||
sessionBus[0], systemBus[0] = dbus.Address()
|
||||
sessionBus[1], systemBus[1] = sessionPath, systemPath
|
||||
d.out = &linePrefixWriter{println: log.Println, prefix: "(dbus) ", msg: new(strings.Builder)}
|
||||
d.out = &linePrefixWriter{println: log.Println, prefix: "(dbus) ", buf: new(strings.Builder)}
|
||||
if final, err := dbus.Finalise(sessionBus, systemBus, session, system); err != nil {
|
||||
if errors.Is(err, syscall.EINVAL) {
|
||||
return nil, newOpErrorMessage("dbus", err,
|
||||
@ -128,12 +129,20 @@ func (d *DBusProxyOp) Is(o Op) bool {
|
||||
func (d *DBusProxyOp) Path() string { return container.Nonexistent }
|
||||
func (d *DBusProxyOp) String() string { return d.proxy.String() }
|
||||
|
||||
const (
|
||||
// lpwSizeThreshold is the threshold of bytes written to linePrefixWriter which,
|
||||
// if reached or exceeded, causes linePrefixWriter to drop all future writes.
|
||||
lpwSizeThreshold = 1 << 24
|
||||
)
|
||||
|
||||
// linePrefixWriter calls println with a prefix for every line written.
|
||||
type linePrefixWriter struct {
|
||||
prefix string
|
||||
println func(v ...any)
|
||||
msg *strings.Builder
|
||||
msgbuf []string
|
||||
|
||||
n int
|
||||
msg []string
|
||||
buf *strings.Builder
|
||||
|
||||
mu sync.RWMutex
|
||||
}
|
||||
@ -145,29 +154,45 @@ func (s *linePrefixWriter) Write(p []byte) (n int, err error) {
|
||||
}
|
||||
|
||||
func (s *linePrefixWriter) write(p []byte, a int) (int, error) {
|
||||
if s.n >= lpwSizeThreshold {
|
||||
if len(p) == 0 {
|
||||
return a, nil
|
||||
}
|
||||
return a, syscall.ENOMEM
|
||||
}
|
||||
|
||||
if i := bytes.IndexByte(p, '\n'); i == -1 {
|
||||
n, _ := s.msg.Write(p)
|
||||
n, _ := s.buf.Write(p)
|
||||
s.n += n
|
||||
return a + n, nil
|
||||
} else {
|
||||
n, _ := s.msg.Write(p[:i])
|
||||
n, _ := s.buf.Write(p[:i])
|
||||
|
||||
// allow container init messages through
|
||||
v := s.msg.String()
|
||||
v := s.buf.String()
|
||||
if strings.HasPrefix(v, "init: ") {
|
||||
// pass through container init messages
|
||||
s.println(s.prefix + v)
|
||||
} else {
|
||||
s.msgbuf = append(s.msgbuf, v)
|
||||
s.msg = append(s.msg, v)
|
||||
}
|
||||
|
||||
s.msg.Reset()
|
||||
s.buf.Reset()
|
||||
s.n += n + 1
|
||||
return s.write(p[i+1:], a+n+1)
|
||||
}
|
||||
}
|
||||
|
||||
func (s *linePrefixWriter) Dump() {
|
||||
s.mu.RLock()
|
||||
for _, m := range s.msgbuf {
|
||||
// the final write might go past the threshold,
|
||||
// and the buffer might still contain data
|
||||
var n int
|
||||
for _, m := range s.msg {
|
||||
n += len(m)
|
||||
s.println(s.prefix + m)
|
||||
}
|
||||
if s.n > lpwSizeThreshold {
|
||||
s.println(s.prefix + "dropped " + strconv.Itoa(s.n-n) + " bytes of output")
|
||||
}
|
||||
s.mu.RUnlock()
|
||||
}
|
||||
|
||||
279
system/dbus_test.go
Normal file
279
system/dbus_test.go
Normal file
@ -0,0 +1,279 @@
|
||||
package system
|
||||
|
||||
import (
|
||||
"reflect"
|
||||
"slices"
|
||||
"strings"
|
||||
"syscall"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestLinePrefixWriter(t *testing.T) {
|
||||
testCases := []struct {
|
||||
name string
|
||||
prefix string
|
||||
f func(w func(s string))
|
||||
wantErr []error
|
||||
wantPt []string
|
||||
want []string
|
||||
wantExt []string
|
||||
wantBuf string
|
||||
}{
|
||||
{"nop", "(nop) ", func(func(string)) {}, nil, nil, nil, nil, ""},
|
||||
|
||||
{"partial", "(break) ", func(w func(string)) {
|
||||
w("C-65533: -> ")
|
||||
}, nil, nil, nil, nil,
|
||||
"C-65533: -> "},
|
||||
|
||||
{"break", "(break) ", func(w func(string)) {
|
||||
w("C-65533: -> ")
|
||||
w("org.freedesktop.DBus fake ListNames\n")
|
||||
}, nil, nil, []string{
|
||||
"C-65533: -> org.freedesktop.DBus fake ListNames",
|
||||
}, nil, ""},
|
||||
|
||||
{"break pt", "(break pt) ", func(w func(string)) {
|
||||
w("init: ")
|
||||
w("received setup parameters\n")
|
||||
}, nil, []string{
|
||||
"init: received setup parameters",
|
||||
}, nil, nil, ""},
|
||||
|
||||
{"threshold", "(threshold) ", func(w func(s string)) {
|
||||
w(string(make([]byte, lpwSizeThreshold)))
|
||||
w("\n")
|
||||
}, []error{nil, syscall.ENOMEM}, nil, nil, nil,
|
||||
string(make([]byte, lpwSizeThreshold))},
|
||||
|
||||
{"threshold multi", "(threshold multi) ", func(w func(s string)) {
|
||||
w(":3\n")
|
||||
w(string(make([]byte, lpwSizeThreshold-3)))
|
||||
w("\n")
|
||||
}, []error{nil, nil, syscall.ENOMEM}, nil, []string{
|
||||
":3",
|
||||
}, nil, string(make([]byte, lpwSizeThreshold-3))},
|
||||
|
||||
{"threshold multi partial", "(threshold multi partial) ", func(w func(s string)) {
|
||||
w(":3\n")
|
||||
w(string(make([]byte, lpwSizeThreshold-2)))
|
||||
}, []error{nil, syscall.ENOMEM}, nil, []string{
|
||||
":3",
|
||||
}, []string{
|
||||
"dropped 16777215 bytes of output",
|
||||
}, string(make([]byte, lpwSizeThreshold-2))},
|
||||
|
||||
{"threshold exact", "(threshold exact) ", func(w func(s string)) {
|
||||
w(string(make([]byte, lpwSizeThreshold-1)))
|
||||
w("\n")
|
||||
}, nil, nil, []string{
|
||||
string(make([]byte, lpwSizeThreshold-1)),
|
||||
}, nil, ""},
|
||||
|
||||
{"sample", "(dbus) ", func(w func(s string)) {
|
||||
w("init: received setup parameters\n")
|
||||
w(`init: mounting "/nix/store/5gml2l2cj28yvyfyzblzjy1laqpxmyzd-libselinux-3.8.1/lib" flags 0x0` + "\n")
|
||||
w(`init: resolved "/host/nix/store/5gml2l2cj28yvyfyzblzjy1laqpxmyzd-libselinux-3.8.1/lib" on "/sysroot/nix/store/5gml2l2cj28yvyfyzblzjy1laqpxmyzd-libselinux-3.8.1/lib" flags 0x4005` + "\n")
|
||||
w(`init: mounting "/nix/store/bcs094l67dlbqf7idxxbljp293zms9mh-util-linux-minimal-2.41-lib/lib" flags 0x0` + "\n")
|
||||
w(`init: resolved "/host/nix/store/bcs094l67dlbqf7idxxbljp293zms9mh-util-linux-minimal-2.41-lib/lib" on "/sysroot/nix/store/bcs094l67dlbqf7idxxbljp293zms9mh-util-linux-minimal-2.41-lib/lib" flags 0x4005` + "\n")
|
||||
w(`init: mounting "/nix/store/jl19fdc7gdxqz9a1s368r9d15vpirnqy-zlib-1.3.1/lib" flags 0x0` + "\n")
|
||||
w(`init: resolved "/host/nix/store/jl19fdc7gdxqz9a1s368r9d15vpirnqy-zlib-1.3.1/lib" on "/sysroot/nix/store/jl19fdc7gdxqz9a1s368r9d15vpirnqy-zlib-1.3.1/lib" flags 0x4005` + "\n")
|
||||
w(`init: mounting "/nix/store/rnn29mhynsa4ncmk0fkcrdr29n0j20l4-libffi-3.4.8/lib" flags 0x0` + "\n")
|
||||
w(`init: resolved "/host/nix/store/rnn29mhynsa4ncmk0fkcrdr29n0j20l4-libffi-3.4.8/lib" on "/sysroot/nix/store/rnn29mhynsa4ncmk0fkcrdr29n0j20l4-libffi-3.4.8/lib" flags 0x4005` + "\n")
|
||||
w(`init: mounting "/nix/store/vvp8hlss3d5q6hn0cifq04jrpnp6bini-pcre2-10.44/lib" flags 0x0` + "\n")
|
||||
w(`init: resolved "/host/nix/store/vvp8hlss3d5q6hn0cifq04jrpnp6bini-pcre2-10.44/lib" on "/sysroot/nix/store/vvp8hlss3d5q6hn0cifq04jrpnp6bini-pcre2-10.44/lib" flags 0x4005` + "\n")
|
||||
w(`init: mounting "/nix/store/y3nxdc2x8hwivppzgx5hkrhacsh87l21-glib-2.84.3/lib" flags 0x0` + "\n")
|
||||
w(`init: resolved "/host/nix/store/y3nxdc2x8hwivppzgx5hkrhacsh87l21-glib-2.84.3/lib" on "/sysroot/nix/store/y3nxdc2x8hwivppzgx5hkrhacsh87l21-glib-2.84.3/lib" flags 0x4005` + "\n")
|
||||
w(`init: mounting "/nix/store/zdpby3l6azi78sl83cpad2qjpfj25aqx-glibc-2.40-66/lib" flags 0x0` + "\n")
|
||||
w(`init: resolved "/host/nix/store/zdpby3l6azi78sl83cpad2qjpfj25aqx-glibc-2.40-66/lib" on "/sysroot/nix/store/zdpby3l6azi78sl83cpad2qjpfj25aqx-glibc-2.40-66/lib" flags 0x4005` + "\n")
|
||||
w(`init: mounting "/nix/store/zdpby3l6azi78sl83cpad2qjpfj25aqx-glibc-2.40-66/lib64" flags 0x0` + "\n")
|
||||
w(`init: resolved "/host/nix/store/zdpby3l6azi78sl83cpad2qjpfj25aqx-glibc-2.40-66/lib" on "/sysroot/nix/store/zdpby3l6azi78sl83cpad2qjpfj25aqx-glibc-2.40-66/lib64" flags 0x4005` + "\n")
|
||||
w(`init: mounting "/run/user/1000" flags 0x0` + "\n")
|
||||
w(`init: resolved "/host/run/user/1000" on "/sysroot/run/user/1000" flags 0x4005` + "\n")
|
||||
w(`init: mounting "/tmp/hakurei.0/99dd71ee2146369514e0d10783368f8f" flags 0x2` + "\n")
|
||||
w(`init: resolved "/host/tmp/hakurei.0/99dd71ee2146369514e0d10783368f8f" on "/sysroot/tmp/hakurei.0/99dd71ee2146369514e0d10783368f8f" flags 0x4004` + "\n")
|
||||
w(`init: mounting "/nix/store/d2divmq2d897amikcwpdx7zrbpddxxcl-xdg-dbus-proxy-0.1.6/bin" flags 0x0` + "\n")
|
||||
w(`init: resolved "/host/nix/store/d2divmq2d897amikcwpdx7zrbpddxxcl-xdg-dbus-proxy-0.1.6/bin" on "/sysroot/nix/store/d2divmq2d897amikcwpdx7zrbpddxxcl-xdg-dbus-proxy-0.1.6/bin" flags 0x4005` + "\n")
|
||||
w("init: resolving presets 0xf\n")
|
||||
w("init: 68 filter rules loaded\n")
|
||||
w("init: starting initial program /nix/store/d2divmq2d897amikcwpdx7zrbpddxxcl-xdg-dbus-proxy-0.1.6/bin/xdg-dbus-proxy\n")
|
||||
w("C1: -> org.freedesktop.DBus call org.freedesktop.DBus.Hello at /org/freedesktop/DBus\n")
|
||||
w("C-65536: -> org.freedesktop.DBus fake wildcarded AddMatch for org.freedesktop.portal\n")
|
||||
w("C-65535: -> org.freedesktop.DBus fake AddMatch for org.freedesktop.Notifications\n")
|
||||
w("C-65534: -> org.freedesktop.DBus fake GetNameOwner for org.freedesktop.Notifications\n")
|
||||
w("C-65533: -> org.freedesktop.DBus fake ListNames\n")
|
||||
w("B1: <- org.freedesktop.DBus return from C1\n")
|
||||
w("B2: <- org.freedesktop.DBus signal org.freedesktop.DBus.NameAcquired at /org/freedesktop/DBus\n")
|
||||
w("B3: <- org.freedesktop.DBus return from C-65536\n")
|
||||
w("*SKIPPED*\n")
|
||||
w("B4: <- org.freedesktop.DBus return from C-65535\n")
|
||||
w("*SKIPPED*\n")
|
||||
w("B5: <- org.freedesktop.DBus return error org.freedesktop.DBus.Error.NameHasNoOwner from C-65534\n")
|
||||
w("*SKIPPED*\n")
|
||||
w("B6: <- org.freedesktop.DBus return from C-65533\n")
|
||||
w("C-65532: -> org.freedesktop.DBus fake GetNameOwner for org.freedesktop.DBus\n")
|
||||
w("*SKIPPED*\n")
|
||||
w("B7: <- org.freedesktop.DBus return from C-65532\n")
|
||||
w("*SKIPPED*\n")
|
||||
w("C2: -> org.freedesktop.DBus call org.freedesktop.DBus.AddMatch at /org/freedesktop/DBus\n")
|
||||
w("C3: -> org.freedesktop.DBus call org.freedesktop.DBus.GetNameOwner at /org/freedesktop/DBus\n")
|
||||
w("C4: -> org.freedesktop.DBus call org.freedesktop.DBus.AddMatch at /org/freedesktop/DBus\n")
|
||||
w("C5: -> org.freedesktop.DBus call org.freedesktop.DBus.StartServiceByName at /org/freedesktop/DBus\n")
|
||||
w("B8: <- org.freedesktop.DBus return from C2\n")
|
||||
w("B9: <- org.freedesktop.DBus return error org.freedesktop.DBus.Error.NameHasNoOwner from C3\n")
|
||||
w("B10: <- org.freedesktop.DBus return from C4\n")
|
||||
w("B12: <- org.freedesktop.DBus signal org.freedesktop.DBus.NameOwnerChanged at /org/freedesktop/DBus\n")
|
||||
w("B11: <- org.freedesktop.DBus return from C5\n")
|
||||
w("C6: -> org.freedesktop.DBus call org.freedesktop.DBus.GetNameOwner at /org/freedesktop/DBus\n")
|
||||
w("B13: <- org.freedesktop.DBus return from C6\n")
|
||||
w("C7: -> :1.4 call org.freedesktop.Notifications.GetServerInformation at /org/freedesktop/Notifications\n")
|
||||
w("B4: <- :1.4 return from C7\n")
|
||||
w("C8: -> :1.4 call org.freedesktop.Notifications.GetServerInformation at /org/freedesktop/Notifications\n")
|
||||
w("B5: <- :1.4 return from C8\n")
|
||||
w("C9: -> :1.4 call org.freedesktop.Notifications.Notify at /org/freedesktop/Notifications\n")
|
||||
w("B6: <- :1.4 return from C9\n")
|
||||
w("C10: -> org.freedesktop.DBus call org.freedesktop.DBus.RemoveMatch at /org/freedesktop/DBus\n")
|
||||
w("C11: -> org.freedesktop.DBus call org.freedesktop.DBus.RemoveMatch at /org/freedesktop/DBus\n")
|
||||
w("B14: <- org.freedesktop.DBus return from C10\n")
|
||||
w("B15: <- org.freedesktop.DBus return from C11\n")
|
||||
w("init: initial process exited with code 0\n")
|
||||
}, nil, []string{
|
||||
"init: received setup parameters",
|
||||
`init: mounting "/nix/store/5gml2l2cj28yvyfyzblzjy1laqpxmyzd-libselinux-3.8.1/lib" flags 0x0`,
|
||||
`init: resolved "/host/nix/store/5gml2l2cj28yvyfyzblzjy1laqpxmyzd-libselinux-3.8.1/lib" on "/sysroot/nix/store/5gml2l2cj28yvyfyzblzjy1laqpxmyzd-libselinux-3.8.1/lib" flags 0x4005`,
|
||||
`init: mounting "/nix/store/bcs094l67dlbqf7idxxbljp293zms9mh-util-linux-minimal-2.41-lib/lib" flags 0x0`,
|
||||
`init: resolved "/host/nix/store/bcs094l67dlbqf7idxxbljp293zms9mh-util-linux-minimal-2.41-lib/lib" on "/sysroot/nix/store/bcs094l67dlbqf7idxxbljp293zms9mh-util-linux-minimal-2.41-lib/lib" flags 0x4005`,
|
||||
`init: mounting "/nix/store/jl19fdc7gdxqz9a1s368r9d15vpirnqy-zlib-1.3.1/lib" flags 0x0`,
|
||||
`init: resolved "/host/nix/store/jl19fdc7gdxqz9a1s368r9d15vpirnqy-zlib-1.3.1/lib" on "/sysroot/nix/store/jl19fdc7gdxqz9a1s368r9d15vpirnqy-zlib-1.3.1/lib" flags 0x4005`,
|
||||
`init: mounting "/nix/store/rnn29mhynsa4ncmk0fkcrdr29n0j20l4-libffi-3.4.8/lib" flags 0x0`,
|
||||
`init: resolved "/host/nix/store/rnn29mhynsa4ncmk0fkcrdr29n0j20l4-libffi-3.4.8/lib" on "/sysroot/nix/store/rnn29mhynsa4ncmk0fkcrdr29n0j20l4-libffi-3.4.8/lib" flags 0x4005`,
|
||||
`init: mounting "/nix/store/vvp8hlss3d5q6hn0cifq04jrpnp6bini-pcre2-10.44/lib" flags 0x0`,
|
||||
`init: resolved "/host/nix/store/vvp8hlss3d5q6hn0cifq04jrpnp6bini-pcre2-10.44/lib" on "/sysroot/nix/store/vvp8hlss3d5q6hn0cifq04jrpnp6bini-pcre2-10.44/lib" flags 0x4005`,
|
||||
`init: mounting "/nix/store/y3nxdc2x8hwivppzgx5hkrhacsh87l21-glib-2.84.3/lib" flags 0x0`,
|
||||
`init: resolved "/host/nix/store/y3nxdc2x8hwivppzgx5hkrhacsh87l21-glib-2.84.3/lib" on "/sysroot/nix/store/y3nxdc2x8hwivppzgx5hkrhacsh87l21-glib-2.84.3/lib" flags 0x4005`,
|
||||
`init: mounting "/nix/store/zdpby3l6azi78sl83cpad2qjpfj25aqx-glibc-2.40-66/lib" flags 0x0`,
|
||||
`init: resolved "/host/nix/store/zdpby3l6azi78sl83cpad2qjpfj25aqx-glibc-2.40-66/lib" on "/sysroot/nix/store/zdpby3l6azi78sl83cpad2qjpfj25aqx-glibc-2.40-66/lib" flags 0x4005`,
|
||||
`init: mounting "/nix/store/zdpby3l6azi78sl83cpad2qjpfj25aqx-glibc-2.40-66/lib64" flags 0x0`,
|
||||
`init: resolved "/host/nix/store/zdpby3l6azi78sl83cpad2qjpfj25aqx-glibc-2.40-66/lib" on "/sysroot/nix/store/zdpby3l6azi78sl83cpad2qjpfj25aqx-glibc-2.40-66/lib64" flags 0x4005`,
|
||||
`init: mounting "/run/user/1000" flags 0x0`,
|
||||
`init: resolved "/host/run/user/1000" on "/sysroot/run/user/1000" flags 0x4005`,
|
||||
`init: mounting "/tmp/hakurei.0/99dd71ee2146369514e0d10783368f8f" flags 0x2`,
|
||||
`init: resolved "/host/tmp/hakurei.0/99dd71ee2146369514e0d10783368f8f" on "/sysroot/tmp/hakurei.0/99dd71ee2146369514e0d10783368f8f" flags 0x4004`,
|
||||
`init: mounting "/nix/store/d2divmq2d897amikcwpdx7zrbpddxxcl-xdg-dbus-proxy-0.1.6/bin" flags 0x0`,
|
||||
`init: resolved "/host/nix/store/d2divmq2d897amikcwpdx7zrbpddxxcl-xdg-dbus-proxy-0.1.6/bin" on "/sysroot/nix/store/d2divmq2d897amikcwpdx7zrbpddxxcl-xdg-dbus-proxy-0.1.6/bin" flags 0x4005`,
|
||||
"init: resolving presets 0xf",
|
||||
"init: 68 filter rules loaded",
|
||||
"init: starting initial program /nix/store/d2divmq2d897amikcwpdx7zrbpddxxcl-xdg-dbus-proxy-0.1.6/bin/xdg-dbus-proxy",
|
||||
|
||||
"init: initial process exited with code 0",
|
||||
}, []string{
|
||||
"C1: -> org.freedesktop.DBus call org.freedesktop.DBus.Hello at /org/freedesktop/DBus",
|
||||
"C-65536: -> org.freedesktop.DBus fake wildcarded AddMatch for org.freedesktop.portal",
|
||||
"C-65535: -> org.freedesktop.DBus fake AddMatch for org.freedesktop.Notifications",
|
||||
"C-65534: -> org.freedesktop.DBus fake GetNameOwner for org.freedesktop.Notifications",
|
||||
"C-65533: -> org.freedesktop.DBus fake ListNames",
|
||||
"B1: <- org.freedesktop.DBus return from C1",
|
||||
"B2: <- org.freedesktop.DBus signal org.freedesktop.DBus.NameAcquired at /org/freedesktop/DBus",
|
||||
"B3: <- org.freedesktop.DBus return from C-65536",
|
||||
"*SKIPPED*",
|
||||
"B4: <- org.freedesktop.DBus return from C-65535",
|
||||
"*SKIPPED*",
|
||||
"B5: <- org.freedesktop.DBus return error org.freedesktop.DBus.Error.NameHasNoOwner from C-65534",
|
||||
"*SKIPPED*",
|
||||
"B6: <- org.freedesktop.DBus return from C-65533",
|
||||
"C-65532: -> org.freedesktop.DBus fake GetNameOwner for org.freedesktop.DBus",
|
||||
"*SKIPPED*",
|
||||
"B7: <- org.freedesktop.DBus return from C-65532",
|
||||
"*SKIPPED*",
|
||||
"C2: -> org.freedesktop.DBus call org.freedesktop.DBus.AddMatch at /org/freedesktop/DBus",
|
||||
"C3: -> org.freedesktop.DBus call org.freedesktop.DBus.GetNameOwner at /org/freedesktop/DBus",
|
||||
"C4: -> org.freedesktop.DBus call org.freedesktop.DBus.AddMatch at /org/freedesktop/DBus",
|
||||
"C5: -> org.freedesktop.DBus call org.freedesktop.DBus.StartServiceByName at /org/freedesktop/DBus",
|
||||
"B8: <- org.freedesktop.DBus return from C2",
|
||||
"B9: <- org.freedesktop.DBus return error org.freedesktop.DBus.Error.NameHasNoOwner from C3",
|
||||
"B10: <- org.freedesktop.DBus return from C4",
|
||||
"B12: <- org.freedesktop.DBus signal org.freedesktop.DBus.NameOwnerChanged at /org/freedesktop/DBus",
|
||||
"B11: <- org.freedesktop.DBus return from C5",
|
||||
"C6: -> org.freedesktop.DBus call org.freedesktop.DBus.GetNameOwner at /org/freedesktop/DBus",
|
||||
"B13: <- org.freedesktop.DBus return from C6",
|
||||
"C7: -> :1.4 call org.freedesktop.Notifications.GetServerInformation at /org/freedesktop/Notifications",
|
||||
"B4: <- :1.4 return from C7",
|
||||
"C8: -> :1.4 call org.freedesktop.Notifications.GetServerInformation at /org/freedesktop/Notifications",
|
||||
"B5: <- :1.4 return from C8",
|
||||
"C9: -> :1.4 call org.freedesktop.Notifications.Notify at /org/freedesktop/Notifications",
|
||||
"B6: <- :1.4 return from C9",
|
||||
"C10: -> org.freedesktop.DBus call org.freedesktop.DBus.RemoveMatch at /org/freedesktop/DBus",
|
||||
"C11: -> org.freedesktop.DBus call org.freedesktop.DBus.RemoveMatch at /org/freedesktop/DBus",
|
||||
"B14: <- org.freedesktop.DBus return from C10",
|
||||
"B15: <- org.freedesktop.DBus return from C11",
|
||||
}, nil, ""},
|
||||
}
|
||||
for _, tc := range testCases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
gotPt := make([]string, 0, len(tc.wantPt))
|
||||
out := &linePrefixWriter{
|
||||
prefix: tc.prefix,
|
||||
println: func(v ...any) {
|
||||
if len(v) != 1 {
|
||||
t.Fatalf("invalid call to println: %#v", v)
|
||||
}
|
||||
gotPt = append(gotPt, v[0].(string))
|
||||
},
|
||||
buf: new(strings.Builder),
|
||||
}
|
||||
|
||||
var pos int
|
||||
tc.f(func(s string) {
|
||||
if _, err := out.Write([]byte(s)); err != nil {
|
||||
if tc.wantErr != nil {
|
||||
if !reflect.DeepEqual(err, tc.wantErr[pos]) {
|
||||
t.Fatalf("Write: error = %v, want %v", err, tc.wantErr[pos])
|
||||
}
|
||||
} else {
|
||||
t.Fatalf("Write: unexpected error: %v", err)
|
||||
return
|
||||
}
|
||||
}
|
||||
pos++
|
||||
})
|
||||
|
||||
if !slices.Equal(out.msg, tc.want) {
|
||||
t.Errorf("msg: %#v, want %#v", out.msg, tc.want)
|
||||
}
|
||||
|
||||
if out.buf.String() != tc.wantBuf {
|
||||
t.Errorf("buf: %q, want %q", out.buf, tc.wantBuf)
|
||||
}
|
||||
|
||||
wantPt := make([]string, len(tc.wantPt))
|
||||
for i, m := range tc.wantPt {
|
||||
wantPt[i] = tc.prefix + m
|
||||
}
|
||||
if !slices.Equal(gotPt, wantPt) {
|
||||
t.Errorf("passthrough: %#v, want %#v", gotPt, wantPt)
|
||||
}
|
||||
|
||||
wantDump := make([]string, len(tc.want)+len(tc.wantExt))
|
||||
for i, m := range tc.want {
|
||||
wantDump[i] = tc.prefix + m
|
||||
}
|
||||
for i, m := range tc.wantExt {
|
||||
wantDump[len(tc.want)+i] = tc.prefix + m
|
||||
}
|
||||
t.Run("dump", func(t *testing.T) {
|
||||
got := make([]string, 0, len(wantDump))
|
||||
out.println = func(v ...any) {
|
||||
if len(v) != 1 {
|
||||
t.Fatalf("Dump: invalid call to println: %#v", v)
|
||||
}
|
||||
got = append(got, v[0].(string))
|
||||
}
|
||||
out.Dump()
|
||||
|
||||
if !slices.Equal(got, wantDump) {
|
||||
t.Errorf("Dump: %#v, want %#v", got, wantDump)
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user