1
0
mirror of https://blitiri.com.ar/repos/chasquid synced 2026-10-29 15:02:30 +00:00

test: Use modern testing features instead of custom helpers

Many of our tests rely on helpers that predate features which are now
available in the standard library.

This patch replaces them with the standard equivalents:

- MustTempDir/RemoveIfOk -> t.ArtifactDir() or t.TempDir() (depending on
  whether it is useful to keep the data on request).
- GetFreePort + waitForServer -> opening the listeners before starting
  the servers. To support this, localrpc.Server gains a Serve method. We
  may re-introduce these in the future if more use cases appear.
- WaitFor and real-time timing checks -> testing/synctest.
- context.Background() -> t.Context().
- Benchmark b.N loops -> b.Loop().
- reflect.DeepEqual -> cmp.Diff, and proto.Equal for protobufs.
This commit is contained in:
Alberto Bertogli
2026-10-03 10:34:35 +01:00
parent 8d763f450d
commit 8b19760f4e
30 changed files with 495 additions and 763 deletions
+10 -17
View File
@@ -5,11 +5,11 @@ import (
"errors"
"os"
"os/exec"
"reflect"
"strings"
"testing"
"blitiri.com.ar/go/chasquid/internal/trace"
"github.com/google/go-cmp/cmp"
)
type Cases []struct {
@@ -29,9 +29,8 @@ func (cases Cases) check(t *testing.T, r *Resolver) {
t.Errorf("case %q: expected error %v, got %v",
c.addr, c.err, err)
}
if !reflect.DeepEqual(got, c.expect) {
t.Errorf("case %q: got %+v, expected %+v",
c.addr, got, c.expect)
if diff := cmp.Diff(c.expect, got); diff != "" {
t.Errorf("case %q: mismatch (-want +got):\n%s", c.addr, diff)
}
}
}
@@ -507,7 +506,8 @@ func TestTooMuchRecursionOnCatchAll(t *testing.T) {
}
func mustWriteFile(t *testing.T, content string) string {
f, err := os.CreateTemp("", "aliases_test")
t.Helper()
f, err := os.CreateTemp(t.TempDir(), "aliases_test")
if err != nil {
t.Fatalf("failed to get temp file: %v", err)
}
@@ -555,7 +555,6 @@ func TestAddFile(t *testing.T) {
for _, c := range cases {
fname := mustWriteFile(t, c.contents)
defer os.Remove(fname)
resolver := NewResolver(allUsersExist)
_, err := resolver.AddAliasesFile("dom", fname)
@@ -568,8 +567,8 @@ func TestAddFile(t *testing.T) {
t.Errorf("case %q, got error: %v", c.contents, err)
continue
}
if !reflect.DeepEqual(got, c.expected) {
t.Errorf("case %q, got %v, expected %v", c.contents, got, c.expected)
if diff := cmp.Diff(c.expected, got); diff != "" {
t.Errorf("case %q: mismatch (-want +got):\n%s", c.contents, diff)
}
}
@@ -590,7 +589,6 @@ func TestAddFile(t *testing.T) {
for _, c := range errcases {
fname := mustWriteFile(t, c.contents)
defer os.Remove(fname)
resolver := NewResolver(allUsersExist)
_, err := resolver.AddAliasesFile("dom", fname)
@@ -637,7 +635,6 @@ y: z`
func TestRichFile(t *testing.T) {
fname := mustWriteFile(t, richFileContents)
defer os.Remove(fname)
resolver := NewResolver(allUsersExist)
resolver.DropChars = "."
@@ -694,9 +691,6 @@ func TestManyFiles(t *testing.T) {
"xd1": mustWriteFile(t, "a: b@xd2"),
"xd2": mustWriteFile(t, "b: |cmd"),
}
for _, fname := range files {
defer os.Remove(fname)
}
resolver := NewResolver(allUsersExist)
for domain, fname := range files {
@@ -804,8 +798,7 @@ func TestHook(t *testing.T) {
if len(rcpts) != 0 {
t.Errorf("expected no recipients, got %v", rcpts)
}
execErr := &exec.ExitError{}
if !errors.As(err, &execErr) {
if _, ok := errors.AsType[*exec.ExitError](err); !ok {
t.Errorf("expected *exec.ExitError, got %T - %v", err, err)
}
}
@@ -846,8 +839,8 @@ func TestParseForward(t *testing.T) {
if addr != c.addr {
t.Errorf("case %q: got addr %q, expected %q", c.raw, addr, c.addr)
}
if !reflect.DeepEqual(via, c.via) {
t.Errorf("case %q: got via %q, expected %q", c.raw, via, c.via)
if diff := cmp.Diff(c.via, via); diff != "" {
t.Errorf("case %q: via mismatch (-want +got):\n%s", c.raw, diff)
}
}
}