From dad2cd6c2722cc9ef5de8630a46c3b837a1aefd4 Mon Sep 17 00:00:00 2001
From: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
Date: Fri, 17 May 2024 09:48:36 -0400
Subject: [PATCH] Remove flaky test (#27041)

---
 server/channels/app/channel_test.go | 98 -----------------------------
 1 file changed, 98 deletions(-)

diff --git a/server/channels/app/channel_test.go b/server/channels/app/channel_test.go
index b9e706065c..44cc457ee8 100644
--- a/server/channels/app/channel_test.go
+++ b/server/channels/app/channel_test.go
@@ -2854,101 +2854,3 @@ func TestPatchChannelMembersNotifyProps(t *testing.T) {
 		assert.NotNil(t, appErr)
 	})
 }
-
-func TestDeleteChannel(t *testing.T) {
-	th := Setup(t).InitBasic()
-	defer th.TearDown()
-
-	t.Run("should send the correct websocket events", func(t *testing.T) {
-		user1 := th.CreateUser()
-		user2 := th.CreateUser()
-
-		channel1 := th.CreateChannel(th.Context, th.BasicTeam)
-		channel2 := th.CreatePrivateChannel(th.Context, th.BasicTeam)
-
-		th.LinkUserToTeam(user1, th.BasicTeam)
-		th.LinkUserToTeam(user2, th.BasicTeam)
-		th.AddUserToChannel(user1, channel1)
-		th.AddUserToChannel(user1, channel2)
-
-		eventTypesFilter := []model.WebsocketEventType{model.WebsocketEventChannelDeleted}
-
-		messages1, closeWS1 := connectFakeWebSocket(t, th, user1.Id, "", eventTypesFilter)
-		defer closeWS1()
-		messages2, closeWS2 := connectFakeWebSocket(t, th, user2.Id, "", eventTypesFilter)
-		defer closeWS2()
-
-		err := th.App.DeleteChannel(th.Context, channel1, "")
-		require.Nil(t, err)
-
-		received := <-messages1
-		assert.Equal(t, model.WebsocketEventChannelDeleted, received.EventType())
-		received = <-messages2
-		assert.Equal(t, model.WebsocketEventChannelDeleted, received.EventType())
-
-		err = th.App.DeleteChannel(th.Context, channel2, "")
-		require.Nil(t, err)
-
-		select {
-		case shouldNotReceive := <-messages2:
-			assert.NotEqual(t, model.WebsocketEventChannelDeleted, shouldNotReceive.EventType())
-		case <-time.After(2 * time.Second):
-		}
-
-		received = <-messages1
-		assert.Equal(t, model.WebsocketEventChannelDeleted, received.EventType())
-	})
-}
-
-func TestRestoreChannel(t *testing.T) {
-	th := Setup(t).InitBasic()
-	defer th.TearDown()
-
-	t.Run("should send the correct websocket events", func(t *testing.T) {
-		user1 := th.CreateUser()
-		user2 := th.CreateUser()
-
-		channel1 := th.CreateChannel(th.Context, th.BasicTeam)
-		channel2 := th.CreatePrivateChannel(th.Context, th.BasicTeam)
-
-		th.LinkUserToTeam(user1, th.BasicTeam)
-		th.LinkUserToTeam(user2, th.BasicTeam)
-		th.AddUserToChannel(user1, channel1)
-		th.AddUserToChannel(user1, channel2)
-
-		err := th.App.DeleteChannel(th.Context, channel1, "")
-		require.Nil(t, err)
-		err = th.App.DeleteChannel(th.Context, channel2, "")
-		require.Nil(t, err)
-
-		channel1.DeleteAt = time.Now().UnixMilli()
-		channel2.DeleteAt = time.Now().UnixMilli()
-
-		eventTypesFilter := []model.WebsocketEventType{model.WebsocketEventChannelRestored}
-
-		messages1, closeWS1 := connectFakeWebSocket(t, th, user1.Id, "", eventTypesFilter)
-		defer closeWS1()
-		messages2, closeWS2 := connectFakeWebSocket(t, th, user2.Id, "", eventTypesFilter)
-		defer closeWS2()
-
-		_, err = th.App.RestoreChannel(th.Context, channel1, "")
-		require.Nil(t, err)
-
-		received := <-messages1
-		assert.Equal(t, model.WebsocketEventChannelRestored, received.EventType())
-		received = <-messages2
-		assert.Equal(t, model.WebsocketEventChannelRestored, received.EventType())
-
-		_, err = th.App.RestoreChannel(th.Context, channel2, "")
-		require.Nil(t, err)
-
-		select {
-		case shouldNotReceive := <-messages2:
-			assert.NotEqual(t, model.WebsocketEventChannelRestored, shouldNotReceive.EventType())
-		case <-time.After(2 * time.Second):
-		}
-
-		received = <-messages1
-		assert.Equal(t, model.WebsocketEventChannelRestored, received.EventType())
-	})
-}