From d6d968d2095b9f56e8b5f97691feebc407f2a623 Mon Sep 17 00:00:00 2001
From: juancwu <git@juancwu.dev>
Date: Wed, 6 May 2026 15:18:17 +0000
Subject: [PATCH] fix: leaky test db

---
 internal/testutil/postgres_main.go | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/internal/testutil/postgres_main.go b/internal/testutil/postgres_main.go
index 85bae04..35f4501 100644
--- a/internal/testutil/postgres_main.go
+++ b/internal/testutil/postgres_main.go
@@ -6,6 +6,9 @@ import (
 	"net"
 	"os"
 	"os/exec"
+	"os/signal"
+	"sync"
+	"syscall"
 	"testing"
 	"time"
 
@@ -59,12 +62,28 @@ func PostgresMain(m *testing.M) {
 		os.Exit(1)
 	}
 
+	var stopOnce sync.Once
 	stop := func() {
-		// `docker rm -f` because --rm only fires on a clean exit; force-stop the
-		// container regardless of state so leftover containers don't accumulate.
-		_ = exec.Command("docker", "rm", "-f", containerName).Run()
+		stopOnce.Do(func() {
+			// `docker rm -f` because --rm only fires on a clean exit; force-stop the
+			// container regardless of state so leftover containers don't accumulate.
+			_ = exec.Command("docker", "rm", "-f", containerName).Run()
+		})
 	}
 
+	// Defers don't run when the test binary is killed by a signal — Ctrl+C from
+	// `task test`, `go test` timeout (SIGQUIT then SIGKILL), or SIGPIPE when a
+	// piped consumer like tparse exits. Trap the common ones so we still clean up.
+	sigCh := make(chan os.Signal, 1)
+	signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP, syscall.SIGQUIT)
+	go func() {
+		sig := <-sigCh
+		stop()
+		// Re-raise with default handler so the parent sees the real exit cause.
+		signal.Reset(sig.(syscall.Signal))
+		_ = syscall.Kill(os.Getpid(), sig.(syscall.Signal))
+	}()
+
 	url := fmt.Sprintf("postgres://budgit_test:testpass@127.0.0.1:%d/budgit_test?sslmode=disable", port)
 	if err := waitForPostgres(url, 60*time.Second); err != nil {
 		stop()
@@ -79,11 +98,10 @@ func PostgresMain(m *testing.M) {
 	}
 
 	// Run tests, then ALWAYS stop the container — including on panic.
-	code := func() int {
+	os.Exit(func() int {
 		defer stop()
 		return m.Run()
-	}()
-	os.Exit(code)
+	}())
 }
 
 func freePort() (int, error) {