agdcslog: imp tests

Author: schzhn

internal/agdcslog/syslog_darwin.go

@@ -31,24 +31,15 @@ const (
 // applied separately to stdout and stderr.
 const defaultOutLimit datasize.ByteSize = 1 * datasize.KB
 
-// loggerProcess abstracts a logger process for a particular severity.
-type loggerProcess interface {
-	// write writes the message to the logger.
-	write(tag, msg string) (err error)
-
-	// close closes the process's pipes and waits for the command to exit.
-	close() (err error)
-}
-
 // systemLogger is the implementation of the [SystemLogger] interface for macOS,
 // which uses the /usr/bin/logger command.
 //
 // TODO(e.burkov):  Get rid of it when golang/go#59229 is resolved.
 type systemLogger struct {
-	debug   loggerProcess
-	info    loggerProcess
-	warning loggerProcess
-	error   loggerProcess
+	debug   *osProcess
+	info    *osProcess
+	warning *osProcess
+	error   *osProcess
 
 	// tag is the prefix for all log messages.
 	//
@@ -145,7 +136,7 @@ func (l *systemLogger) Close() (err error) {
 	defer func() { err = errors.Annotate(err, "closing logger processes: %w") }()
 
 	var errs []error
-	procs := []loggerProcess{
+	procs := []*osProcess{
 		l.debug,
 		l.info,
 		l.warning,
@@ -167,8 +158,8 @@ func (l *systemLogger) Close() (err error) {
 	return errors.Join(errs...)
 }
 
-// process is an instance of the logger process with a particular severity.
-type process struct {
+// osProcess is an instance of the logger process with a particular severity.
+type osProcess struct {
 	// mu synchronizes writes to stdin between each other and with the process
 	// closing.
 	mu *sync.Mutex
@@ -195,7 +186,7 @@ func newProcess(
 	ctx context.Context,
 	cmdCons executil.CommandConstructor,
 	sev severity,
-) (p *process, err error) {
+) (p *osProcess, err error) {
 	const (
 		binPath        = "/usr/bin/logger"
 		optionPriority = "-p"
@@ -228,7 +219,7 @@ func newProcess(
 		return nil, fmt.Errorf("starting command: %w", err)
 	}
 
-	return &process{
+	return &osProcess{
 		mu:       &sync.Mutex{},
 		cmd:      cmd,
 		stdin:    stdinWriter,
@@ -238,11 +229,8 @@ func newProcess(
 	}, nil
 }
 
-// type check
-var _ loggerProcess = (*process)(nil)
-
-// write implements the [loggerProcess] interface for *process.
-func (p *process) write(tag, msg string) (err error) {
+// write writes the message to the logger.
+func (p *osProcess) write(tag, msg string) (err error) {
 	defer func() { err = errors.Annotate(err, "writing %s message", p.severity) }()
 
 	msg = strings.TrimSuffix(msg, "\n")
@@ -255,8 +243,8 @@ func (p *process) write(tag, msg string) (err error) {
 	return err
 }
 
-// close implements the [loggerProcess] interface for *process.
-func (p *process) close() (err error) {
+// close closes the process's pipes and waits for the command to exit.
+func (p *osProcess) close() (err error) {
 	defer func() { err = errors.Annotate(err, "closing %s logger: %w", p.severity) }()
 
 	var errs []error

internal/agdcslog/syslog_linux_internal_test.go

@@ -4,8 +4,10 @@ package agdcslog
 
 import (
 	"bytes"
+	"io"
 	"log/syslog"
 	"net"
+	"net/netip"
 	"testing"
 	"time"
 
@@ -28,31 +30,38 @@ func TestSystemLogger(t *testing.T) {
 		errMsg   = "err_msg"
 	)
 
-	localhost := netutil.IPv4Localhost().AsSlice()
-	addr := &net.UDPAddr{IP: localhost, Port: 0}
-	conn, err := net.ListenUDP("udp", addr)
+	localhostAnyPort := netip.AddrPortFrom(netutil.IPv4Localhost(), 0)
+	addr := net.TCPAddrFromAddrPort(localhostAnyPort)
+	ln, err := net.ListenTCP("tcp", addr)
 	require.NoError(t, err)
-	testutil.CleanupAndRequireSuccess(t, conn.Close)
+	testutil.CleanupAndRequireSuccess(t, ln.Close)
 
-	w, err := syslog.Dial("udp", conn.LocalAddr().String(), syslog.LOG_LOCAL0, testTag)
+	w, err := syslog.Dial("tcp", ln.Addr().String(), syslog.LOG_LOCAL0, testTag)
 	require.NoError(t, err)
 
 	l := &systemLogger{writer: w}
-	testutil.CleanupAndRequireSuccess(t, l.Close)
-
 	require.NoError(t, l.Debug(debugMsg))
 	require.NoError(t, l.Info(infoMsg))
 	require.NoError(t, l.Warning(warnMsg))
 	require.NoError(t, l.Error(errMsg))
+	require.NoError(t, l.Close())
+
+	conn, err := ln.Accept()
+	require.NoError(t, err)
+	testutil.CleanupAndRequireSuccess(t, conn.Close)
 
 	stdoutBuf := bytes.Buffer{}
 	data := make([]byte, 4096)
-	for range 4 {
+	for {
 		err = conn.SetReadDeadline(time.Now().Add(testTimeout))
 		require.NoError(t, err)
 
 		var n int
-		n, _, err = conn.ReadFromUDP(data)
+		n, err = conn.Read(data)
+		if err == io.EOF {
+			break
+		}
+
 		require.NoError(t, err)
 
 		_, err = stdoutBuf.Write(data[:n])