From 918fff378d16deda3846082e248e0ad5df02ec6c Mon Sep 17 00:00:00 2001 From: Ben Schumacher Date: Mon, 4 Sep 2023 10:41:05 +0200 Subject: [PATCH] [MM-47612] Fix flaky TestPluginAPIDeleteUserPreferences (#24406) --- server/channels/app/plugin_api_test.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/server/channels/app/plugin_api_test.go b/server/channels/app/plugin_api_test.go index fdfbb28f53..02cc881467 100644 --- a/server/channels/app/plugin_api_test.go +++ b/server/channels/app/plugin_api_test.go @@ -193,7 +193,6 @@ func TestPluginAPIGetUserPreferences(t *testing.T) { } func TestPluginAPIDeleteUserPreferences(t *testing.T) { - t.Skip("MM-47612") th := Setup(t) defer th.TearDown() api := th.SetupPluginAPI() @@ -208,7 +207,7 @@ func TestPluginAPIDeleteUserPreferences(t *testing.T) { preferences, err := api.GetPreferencesForUser(user1.Id) require.Nil(t, err) - assert.Equal(t, 3, len(preferences)) + assert.Equal(t, 2, len(preferences)) err = api.DeletePreferencesForUser(user1.Id, preferences) require.Nil(t, err) @@ -235,15 +234,17 @@ func TestPluginAPIDeleteUserPreferences(t *testing.T) { preferences, err = api.GetPreferencesForUser(user2.Id) require.Nil(t, err) - assert.Equal(t, 4, len(preferences)) + assert.Equal(t, 3, len(preferences)) err = api.DeletePreferencesForUser(user2.Id, []model.Preference{preference}) require.Nil(t, err) preferences, err = api.GetPreferencesForUser(user2.Id) require.Nil(t, err) assert.Equal(t, 2, len(preferences)) - assert.Equal(t, model.PreferenceRecommendedNextSteps, preferences[0].Category) - assert.Equal(t, model.PreferenceCategoryTutorialSteps, preferences[1].Category) + assert.ElementsMatch(t, + []string{model.PreferenceRecommendedNextSteps, model.PreferenceCategoryTutorialSteps}, + []string{preferences[0].Category, preferences[1].Category}, + ) } func TestPluginAPIUpdateUserPreferences(t *testing.T) {