From 5f7ca55b130c4e55e7149a32435516cbfe1fb6af Mon Sep 17 00:00:00 2001 From: Patryk Pomykalski Date: Mon, 13 Jan 2020 16:54:07 +0100 Subject: [PATCH] MM-21520: Remove temporary databases after tests run (#13572) * MM-21520: Remove temorary databases after tests run * accidental test name change Co-authored-by: mattermod --- config/migrate_test.go | 3 +++ store/localcachelayer/layer_test.go | 3 +++ store/sqlstore/store_test.go | 3 +++ 3 files changed, 9 insertions(+) diff --git a/config/migrate_test.go b/config/migrate_test.go index 1cc614bfcd..2a934ec280 100644 --- a/config/migrate_test.go +++ b/config/migrate_test.go @@ -7,6 +7,7 @@ import ( "fmt" "testing" + "github.com/mattermost/mattermost-server/v5/store/storetest" "github.com/mattermost/mattermost-server/v5/testlib" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -15,6 +16,7 @@ import ( func TestMigrateDatabaseToFile(t *testing.T) { helper := testlib.NewMainHelper() sqlSettings := helper.GetSqlSettings() + defer storetest.CleanupSqlSettings(sqlSettings) sqlDSN := fmt.Sprintf("%s://%s", *sqlSettings.DriverName, *sqlSettings.DataSource) fileDSN := "config.json" files := []string{"IdpCertificateFile", "PublicCertificateFile", "PrivateKeyFile"} @@ -53,6 +55,7 @@ func TestMigrateDatabaseToFile(t *testing.T) { func TestMigrateFileToDatabaseWhenFilePathIsNotSpecified(t *testing.T) { helper := testlib.NewMainHelper() sqlSettings := helper.GetSqlSettings() + defer storetest.CleanupSqlSettings(sqlSettings) sqlDSN := fmt.Sprintf("%s://%s", *sqlSettings.DriverName, *sqlSettings.DataSource) fileDSN := "config.json" diff --git a/store/localcachelayer/layer_test.go b/store/localcachelayer/layer_test.go index 96278ff861..176bb0c52c 100644 --- a/store/localcachelayer/layer_test.go +++ b/store/localcachelayer/layer_test.go @@ -91,6 +91,9 @@ func tearDownStores() { if st.Store != nil { st.Store.Close() } + if st.SqlSettings != nil { + storetest.CleanupSqlSettings(st.SqlSettings) + } wg.Done() }() } diff --git a/store/sqlstore/store_test.go b/store/sqlstore/store_test.go index ebe4746baa..459c1611ae 100644 --- a/store/sqlstore/store_test.go +++ b/store/sqlstore/store_test.go @@ -90,6 +90,9 @@ func tearDownStores() { if st.Store != nil { st.Store.Close() } + if st.SqlSettings != nil { + storetest.CleanupSqlSettings(st.SqlSettings) + } wg.Done() }() }