diff options
| author | Toon Claes <toon@gitlab.com> | 2021-10-25 18:46:29 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2021-10-25 18:46:29 +0300 |
| commit | 6d24a62fe1c01b3e3f26039ca9902e6f45389a16 (patch) | |
| tree | 5ed9cf9826ec8b934537b7e93196268cdc7fdda2 | |
| parent | a6633baf092115fbc1fa0cd99d5b62fc9a1d37a6 (diff) | |
| parent | b8ae1bf52a3a36051d8704403d472418790d2824 (diff) | |
Merge branch 'jc-fix-TestCachingStorageProvider_GetSyncedNodes' into 'master'
Close database connection in test database setup
Closes #3871
See merge request gitlab-org/gitaly!4012
| -rw-r--r-- | internal/praefect/datastore/glsql/testing.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/internal/praefect/datastore/glsql/testing.go b/internal/praefect/datastore/glsql/testing.go index 5181bf9c7..915576985 100644 --- a/internal/praefect/datastore/glsql/testing.go +++ b/internal/praefect/datastore/glsql/testing.go @@ -227,11 +227,11 @@ func initPraefectTestDB(t testing.TB, database string) *sql.DB { _, err = postgresDB.Exec("CREATE DATABASE " + praefectTemplateDatabase + " WITH ENCODING 'UTF8'") require.NoErrorf(t, err, "failed to create %q database", praefectTemplateDatabase) - templateDB = requireSQLOpen(t, templateDBConf, true) + remigrateTemplateDB := requireSQLOpen(t, templateDBConf, true) defer func() { - require.NoErrorf(t, templateDB.Close(), "release connection to the %q database", templateDBConf.DBName) + require.NoErrorf(t, remigrateTemplateDB.Close(), "release connection to the %q database", templateDBConf.DBName) }() - _, err = Migrate(templateDB, false) + _, err = Migrate(remigrateTemplateDB, false) require.NoErrorf(t, err, "failed to run database migration on %q", praefectTemplateDatabase) } else { require.NoErrorf(t, err, "failed to run database migration on %q", praefectTemplateDatabase) |