iotest.Writer => ioutil.TestLogWriter (#213)

Drop the partial implementation of a testing.T writer (iotest.Writer)
in favor of the more complete implementation in go.abhg.dev/io/ioutil.

Author: abhinav

config_test.go

@@ -5,13 +5,13 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/abhinav/tmux-fastcopy/internal/iotest"
 	"github.com/abhinav/tmux-fastcopy/internal/tmux"
 	"github.com/abhinav/tmux-fastcopy/internal/tmux/tmuxopt"
 	"github.com/abhinav/tmux-fastcopy/internal/tmux/tmuxtest"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.abhg.dev/io/ioutil"
 	"pgregory.net/rapid"
 )
 
@@ -272,7 +272,7 @@ func TestConfigFlags(t *testing.T) {
 
 			var cfg config
 			fset := flag.NewFlagSet(t.Name(), flag.ContinueOnError)
-			fset.SetOutput(iotest.Writer(t))
+			fset.SetOutput(ioutil.TestLogWriter(t, ""))
 			cfg.RegisterFlags(fset)
 
 			err := fset.Parse(tt.give)
@@ -291,7 +291,7 @@ func TestConfigFlags(t *testing.T) {
 				args := cfg.Flags()
 
 				fset := flag.NewFlagSet(t.Name(), flag.ContinueOnError)
-				fset.SetOutput(iotest.Writer(t))
+				fset.SetOutput(ioutil.TestLogWriter(t, ""))
 				var got config
 				got.RegisterFlags(fset)
 
@@ -484,8 +484,10 @@ func TestConfigFlags_rapid(t *testing.T) {
 			t.Skip()
 		}
 
+		output, done := ioutil.PrintfWriter(t.Logf, "")
+		defer done()
 		flag := flag.NewFlagSet(t.Name(), flag.ContinueOnError)
-		flag.SetOutput(iotest.Writer(t))
+		flag.SetOutput(output)
 
 		var got config
 		got.RegisterFlags(flag)
@@ -507,7 +509,7 @@ func TestUsageHasAllConfigFlags(t *testing.T) {
 	// _usage.
 
 	fset := flag.NewFlagSet(t.Name(), flag.ContinueOnError)
-	fset.SetOutput(iotest.Writer(t))
+	fset.SetOutput(ioutil.TestLogWriter(t, ""))
 	new(config).RegisterFlags(fset)
 
 	fset.VisitAll(func(f *flag.Flag) {

go.mod

@@ -1,6 +1,8 @@
 module github.com/abhinav/tmux-fastcopy
 
-go 1.23.3
+go 1.23.4
+
+toolchain go1.23.5
 
 require (
 	github.com/benbjohnson/clock v1.3.5
@@ -11,6 +13,7 @@ require (
 	github.com/rivo/uniseg v0.4.7
 	github.com/stretchr/testify v1.10.0
 	go.abhg.dev/algorithm/huffman v0.2.0
+	go.abhg.dev/io/ioutil v0.1.0
 	go.uber.org/multierr v1.11.0
 	pgregory.net/rapid v1.1.0
 )

go.sum

@@ -27,6 +27,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.abhg.dev/algorithm/huffman v0.2.0 h1:ABToWAM+WRXa2jqwzvyN17iNn5MMqxXtFZ7b+RmRrjU=
 go.abhg.dev/algorithm/huffman v0.2.0/go.mod h1:FR+G7qqDYLe4hQ+8dFp6a3PjfNkg3MLCW0/oV3h6Py0=
+go.abhg.dev/io/ioutil v0.1.0 h1:YGGMzh9HT52JYuVWbnr/E5GkYHbL3yRNDjcxFDaUHNk=
+go.abhg.dev/io/ioutil v0.1.0/go.mod h1:79IIyZVWxNZE8hBxMtubM8zJFPs+2NCqHYfWeH3X6hM=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

integration/go.mod

@@ -1,11 +1,14 @@
 module github.com/abhinav/tmux-fastcopy/integration
 
-go 1.23.3
+go 1.23.4
+
+toolchain go1.23.5
 
 require (
 	github.com/abhinav/tmux-fastcopy v0.14.1
 	github.com/creack/pty v1.1.24
 	github.com/stretchr/testify v1.10.0
+	go.abhg.dev/io/ioutil v0.1.0
 	go.uber.org/multierr v1.11.0
 )
 

integration/go.sum

@@ -8,6 +8,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+go.abhg.dev/io/ioutil v0.1.0 h1:YGGMzh9HT52JYuVWbnr/E5GkYHbL3yRNDjcxFDaUHNk=
+go.abhg.dev/io/ioutil v0.1.0/go.mod h1:79IIyZVWxNZE8hBxMtubM8zJFPs+2NCqHYfWeH3X6hM=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

integration/integration_test.go

@@ -16,10 +16,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/abhinav/tmux-fastcopy/internal/iotest"
 	"github.com/creack/pty"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.abhg.dev/io/ioutil"
 	"go.uber.org/multierr"
 )
 
@@ -634,10 +634,10 @@ type virtualTmuxConfig struct {
 }
 
 func (cfg *virtualTmuxConfig) Build(t testing.TB) *virtualTmux {
-	stderr := iotest.Writer(t)
+	stderr := ioutil.TestLogWriter(t, "")
 	cmd := exec.Command(cfg.Tmux)
 	cmd.Env = cfg.Env
-	cmd.Stderr = iotest.Writer(t)
+	cmd.Stderr = ioutil.TestLogWriter(t, "")
 	cmd.Dir = cfg.Dir
 
 	t.Logf("Starting tmux with size %dx%d", cfg.Width, cfg.Height)

integration/unquote_test.go

@@ -8,10 +8,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/abhinav/tmux-fastcopy/internal/iotest"
 	"github.com/abhinav/tmux-fastcopy/internal/tmux/tmuxopt"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.abhg.dev/io/ioutil"
 )
 
 func TestUnquoteTmuxOptions(t *testing.T) {
@@ -39,7 +39,7 @@ func TestUnquoteTmuxOptions(t *testing.T) {
 		"SHELL=/bin/sh",
 		"TMUX_TMPDIR=" + tmpDir,
 	}
-	cmdout := iotest.Writer(t)
+	cmdout := ioutil.TestLogWriter(t, "")
 
 	cmd := exec.Command(tmuxExe, "start-server", ";", "new-session", "-d")
 	cmd.Dir = root

internal/iotest/writer.go

@@ -4,11 +4,11 @@ package logtest
 import (
 	"testing"
 
-	"github.com/abhinav/tmux-fastcopy/internal/iotest"
 	"github.com/abhinav/tmux-fastcopy/internal/log"
+	"go.abhg.dev/io/ioutil"
 )
 
 // NewLogger builds a logger at debug level that writes to a testing.T.
 func NewLogger(t testing.TB) *log.Logger {
-	return log.New(iotest.Writer(t)).WithLevel(log.Debug)
+	return log.New(ioutil.TestLogWriter(t, "")).WithLevel(log.Debug)
 }