Mirrors/go-chasquid-smtp
1
0
Fork 0
mirror of https://blitiri.com.ar/repos/chasquid synced 2026-10-28 15:02:28 +00:00
Code Releases Activity

test: Use modern testing features instead of custom helpers

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
internal/config/config_test.go
+10 -16
View File
@@ -5,22 +5,21 @@ import (
"os"
"testing"
"blitiri.com.ar/go/chasquid/internal/testlib"
"blitiri.com.ar/go/log"
"github.com/google/go-cmp/cmp"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/testing/protocmp"
)
func mustCreateConfig(t *testing.T, contents string) (string, string) {
tmpDir := testlib.MustTempDir(t)
confStr := []byte(contents)
err := os.WriteFile(tmpDir+"/chasquid.conf", confStr, 0600)
func mustCreateConfig(t *testing.T, contents string) string {
t.Helper()
path := t.ArtifactDir() + "/chasquid.conf"
err := os.WriteFile(path, []byte(contents), 0600)
if err != nil {
t.Fatalf("Failed to write tmp config: %v", err)
}
return tmpDir, tmpDir + "/chasquid.conf"
return path
}
func TestEmptyStruct(t *testing.T) {
@@ -28,8 +27,7 @@ func TestEmptyStruct(t *testing.T) {
}
func TestEmptyConfig(t *testing.T) {
tmpDir, path := mustCreateConfig(t, "")
defer testlib.RemoveIfOk(t, tmpDir)
path := mustCreateConfig(t, "")
c, err := Load(path, "")
if err != nil {
t.Fatalf("error loading empty config: %v", err)
@@ -61,8 +59,7 @@ func TestFullConfig(t *testing.T) {
max_queue_items: 345
`
tmpDir, path := mustCreateConfig(t, confStr)
defer testlib.RemoveIfOk(t, tmpDir)
path := mustCreateConfig(t, confStr)
overrideStr := `
hostname: "proust"
@@ -118,9 +115,8 @@ func TestErrorLoading(t *testing.T) {
}
func TestBrokenConfig(t *testing.T) {
tmpDir, path := mustCreateConfig(
path := mustCreateConfig(
t, "<invalid> this is not a valid protobuf")
defer testlib.RemoveIfOk(t, tmpDir)
c, err := Load(path, "")
if err == nil {
@@ -129,9 +125,8 @@ func TestBrokenConfig(t *testing.T) {
}
func TestBrokenOverride(t *testing.T) {
tmpDir, path := mustCreateConfig(
path := mustCreateConfig(
t, `hostname: "test"`)
defer testlib.RemoveIfOk(t, tmpDir)
c, err := Load(path, "broken override")
if err == nil {
@@ -140,9 +135,8 @@ func TestBrokenOverride(t *testing.T) {
}
func TestInvalidGiveUpSendingAfter(t *testing.T) {
tmpDir, path := mustCreateConfig(
path := mustCreateConfig(
t, `give_up_send_after: "10"`)
defer testlib.RemoveIfOk(t, tmpDir)
c, err := Load(path, "")
if err == nil {