From 1fb83b3463ef7e9ad4aea90a11b8b6d51fcc9fe1 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Mon, 17 Oct 2022 16:48:53 +0100
Subject: [PATCH] Ah, don't undo the thing yet

---
 userapi/consumers/roomserver_test.go |  8 +++++---
 userapi/storage/storage_test.go      |  8 +++++---
 userapi/userapi_test.go              | 12 +++++++-----
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/userapi/consumers/roomserver_test.go b/userapi/consumers/roomserver_test.go
index 1e473647a..e4587670f 100644
--- a/userapi/consumers/roomserver_test.go
+++ b/userapi/consumers/roomserver_test.go
@@ -15,8 +15,7 @@ import (
 )
 
 func mustCreateDatabase(t *testing.T, dbType test.DBType) (storage.Database, func()) {
-	base, close := testrig.CreateBaseDendrite(t, dbType)
-	defer close()
+	base, baseclose := testrig.CreateBaseDendrite(t, dbType)
 	t.Helper()
 	connStr, close := test.PrepareDBConnectionString(t, dbType)
 	db, err := storage.NewUserAPIDatabase(base, &config.DatabaseOptions{
@@ -25,7 +24,10 @@ func mustCreateDatabase(t *testing.T, dbType test.DBType) (storage.Database, fun
 	if err != nil {
 		t.Fatalf("failed to create new user db: %v", err)
 	}
-	return db, close
+	return db, func() {
+		close()
+		baseclose()
+	}
 }
 
 func mustCreateEvent(t *testing.T, content string) *gomatrixserverlib.HeaderedEvent {
diff --git a/userapi/storage/storage_test.go b/userapi/storage/storage_test.go
index bbecc17f1..8e5b32b6a 100644
--- a/userapi/storage/storage_test.go
+++ b/userapi/storage/storage_test.go
@@ -30,8 +30,7 @@ var (
 )
 
 func mustCreateDatabase(t *testing.T, dbType test.DBType) (storage.Database, func()) {
-	base, close := testrig.CreateBaseDendrite(t, dbType)
-	defer close()
+	base, baseclose := testrig.CreateBaseDendrite(t, dbType)
 	connStr, close := test.PrepareDBConnectionString(t, dbType)
 	db, err := storage.NewUserAPIDatabase(base, &config.DatabaseOptions{
 		ConnectionString: config.DataSource(connStr),
@@ -39,7 +38,10 @@ func mustCreateDatabase(t *testing.T, dbType test.DBType) (storage.Database, fun
 	if err != nil {
 		t.Fatalf("NewUserAPIDatabase returned %s", err)
 	}
-	return db, close
+	return db, func() {
+		close()
+		baseclose()
+	}
 }
 
 // Tests storing and getting account data
diff --git a/userapi/userapi_test.go b/userapi/userapi_test.go
index c31b6de6f..4417f4dc0 100644
--- a/userapi/userapi_test.go
+++ b/userapi/userapi_test.go
@@ -49,8 +49,7 @@ func MustMakeInternalAPI(t *testing.T, opts apiTestOpts, dbType test.DBType) (ap
 	if opts.loginTokenLifetime == 0 {
 		opts.loginTokenLifetime = api.DefaultLoginTokenLifetime * time.Millisecond
 	}
-	base, close := testrig.CreateBaseDendrite(t, dbType)
-	defer close()
+	base, baseclose := testrig.CreateBaseDendrite(t, dbType)
 	connStr, close := test.PrepareDBConnectionString(t, dbType)
 	accountDB, err := storage.NewUserAPIDatabase(base, &config.DatabaseOptions{
 		ConnectionString: config.DataSource(connStr),
@@ -66,9 +65,12 @@ func MustMakeInternalAPI(t *testing.T, opts apiTestOpts, dbType test.DBType) (ap
 	}
 
 	return &internal.UserInternalAPI{
-		DB:         accountDB,
-		ServerName: cfg.Matrix.ServerName,
-	}, accountDB, close
+			DB:         accountDB,
+			ServerName: cfg.Matrix.ServerName,
+		}, accountDB, func() {
+			close()
+			baseclose()
+		}
 }
 
 func TestQueryProfile(t *testing.T) {