From 2f8c65a1eac0a55d552d8afd0d77f9bfb0f2a207 Mon Sep 17 00:00:00 2001 From: Claudio Costa Date: Wed, 19 Feb 2025 08:56:56 -0600 Subject: [PATCH] Fix flaky TestGetMattermostLog (#29890) --- server/channels/app/platform/log_test.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/server/channels/app/platform/log_test.go b/server/channels/app/platform/log_test.go index 8d7fd1d421..72caed332e 100644 --- a/server/channels/app/platform/log_test.go +++ b/server/channels/app/platform/log_test.go @@ -19,8 +19,6 @@ import ( ) func TestGetMattermostLog(t *testing.T) { - t.Skip("MM-62438") - th := Setup(t) defer th.TearDown() @@ -36,6 +34,14 @@ func TestGetMattermostLog(t *testing.T) { dir, err := os.MkdirTemp("", "") require.NoError(t, err) t.Cleanup(func() { + // MM-62438: Disable file target before cleaning up + // to avoid a race between removing the directory and the file + // getting written again. + th.Service.UpdateConfig(func(cfg *model.Config) { + *cfg.LogSettings.EnableFile = false + }) + th.Service.Logger().Flush() + err = os.RemoveAll(dir) assert.NoError(t, err) })