chore: fix lengthy tests in psql

kylecarbs · kylecarbs · commit 80d319ca4c9a · 2023-05-16T16:31:09.000Z
This was adding at a minimum 3mins to our psql tests!
diff --git a/cli/server_test.go b/cli/server_test.go
@@ -122,7 +122,8 @@ func TestServer(t *testing.T) {
 
 		const superDuperLong = testutil.WaitSuperLong * 3
 
-		ctx := testutil.Context(t, superDuperLong)
+		ctx, cancelFunc := context.WithTimeout(context.Background(), superDuperLong)
+		defer cancelFunc()
 		clitest.Start(t, inv.WithContext(ctx))
 
 		//nolint:gocritic // Embedded postgres take a while to fire up.
@@ -1460,8 +1461,8 @@ func TestServer(t *testing.T) {
 	})
 }
 
-//nolint:tparallel,paralleltest // This test spawns or connects to an existing PostgreSQL instance.
 func TestServer_Production(t *testing.T) {
+	t.Parallel()
 	if runtime.GOOS != "linux" || testing.Short() {
 		// Skip on non-Linux because it spawns a PostgreSQL instance.
 		t.SkipNow()
@@ -1471,7 +1472,8 @@ func TestServer_Production(t *testing.T) {
 	defer closeFunc()
 
 	// Postgres + race detector + CI = slow.
-	ctx := testutil.Context(t, testutil.WaitSuperLong*3)
+	ctx, cancelFunc := context.WithTimeout(context.Background(), testutil.WaitSuperLong*3)
+	defer cancelFunc()
 
 	inv, cfg := clitest.New(t,
 		"server",
