From 1f165799e0365dafc32a166f624a3e297f192e0b Mon Sep 17 00:00:00 2001 From: Hossein Date: Wed, 24 Mar 2021 07:02:17 -0400 Subject: [PATCH] [MM-34166] Fix Flaky Test TestGenerateSupportPacket (#17207) * fix flaky tests * Revert "fix flaky tests" This reverts commit 255ce27bf618687927017e1947ad12a538cd525f. * Fix flaky test * Fix equal --- app/server_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/server_test.go b/app/server_test.go index d25dbd7fa3..17c678b004 100644 --- a/app/server_test.go +++ b/app/server_test.go @@ -205,7 +205,12 @@ func TestStartServerTLSSuccess(t *testing.T) { func TestDatabaseTypeAndMattermostVersion(t *testing.T) { sqlDrivernameEnvironment := os.Getenv("MM_SQLSETTINGS_DRIVERNAME") - defer os.Setenv("MM_SQLSETTINGS_DRIVERNAME", sqlDrivernameEnvironment) + + if sqlDrivernameEnvironment != "" { + defer os.Setenv("MM_SQLSETTINGS_DRIVERNAME", sqlDrivernameEnvironment) + } else { + defer os.Unsetenv("MM_SQLSETTINGS_DRIVERNAME") + } os.Setenv("MM_SQLSETTINGS_DRIVERNAME", "postgres")