[MM-61778] Fix errcheck issues in web_hub_test.go (#30676)
Co-authored-by: Claude <noreply@anthropic.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
2f5b70bfa2
Коммит
f1ddeec2f6
@@ -98,7 +98,6 @@ issues:
|
|||||||
channels/app/platform/license.go|\
|
channels/app/platform/license.go|\
|
||||||
channels/app/platform/session.go|\
|
channels/app/platform/session.go|\
|
||||||
channels/app/platform/status.go|\
|
channels/app/platform/status.go|\
|
||||||
channels/app/platform/web_hub_test.go|\
|
|
||||||
channels/app/slashcommands/command_test.go|\
|
channels/app/slashcommands/command_test.go|\
|
||||||
channels/app/slashcommands/helper_test.go|\
|
channels/app/slashcommands/helper_test.go|\
|
||||||
channels/app/team_test.go|\
|
channels/app/team_test.go|\
|
||||||
|
|||||||
@@ -69,7 +69,8 @@ func TestHubStopWithMultipleConnections(t *testing.T) {
|
|||||||
})
|
})
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
th.Service.Start(nil)
|
err = th.Service.Start(nil)
|
||||||
|
require.NoError(t, err)
|
||||||
wc1 := registerDummyWebConn(t, th, s.Listener.Addr(), session)
|
wc1 := registerDummyWebConn(t, th, s.Listener.Addr(), session)
|
||||||
wc2 := registerDummyWebConn(t, th, s.Listener.Addr(), session)
|
wc2 := registerDummyWebConn(t, th, s.Listener.Addr(), session)
|
||||||
wc3 := registerDummyWebConn(t, th, s.Listener.Addr(), session)
|
wc3 := registerDummyWebConn(t, th, s.Listener.Addr(), session)
|
||||||
@@ -93,7 +94,8 @@ func TestHubStopRaceCondition(t *testing.T) {
|
|||||||
})
|
})
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
th.Service.Start(nil)
|
err = th.Service.Start(nil)
|
||||||
|
require.NoError(t, err)
|
||||||
wc1 := registerDummyWebConn(t, th, s.Listener.Addr(), session)
|
wc1 := registerDummyWebConn(t, th, s.Listener.Addr(), session)
|
||||||
defer wc1.Close()
|
defer wc1.Close()
|
||||||
|
|
||||||
@@ -237,10 +239,14 @@ func TestHubConnIndex(t *testing.T) {
|
|||||||
wc4.SetConnectionID(model.NewId())
|
wc4.SetConnectionID(model.NewId())
|
||||||
wc4.SetSession(&model.Session{})
|
wc4.SetSession(&model.Session{})
|
||||||
|
|
||||||
connIndex.Add(wc1)
|
errAdd := connIndex.Add(wc1)
|
||||||
connIndex.Add(wc2)
|
require.NoError(t, errAdd)
|
||||||
connIndex.Add(wc3)
|
err = connIndex.Add(wc2)
|
||||||
connIndex.Add(wc4)
|
require.NoError(t, err)
|
||||||
|
err = connIndex.Add(wc3)
|
||||||
|
require.NoError(t, err)
|
||||||
|
err = connIndex.Add(wc4)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
t.Run("Basic", func(t *testing.T) {
|
t.Run("Basic", func(t *testing.T) {
|
||||||
assert.True(t, connIndex.Has(wc1))
|
assert.True(t, connIndex.Has(wc1))
|
||||||
@@ -327,8 +333,10 @@ func TestHubConnIndex(t *testing.T) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
t.Run("adding", func(t *testing.T) {
|
t.Run("adding", func(t *testing.T) {
|
||||||
connIndex.Add(wc1)
|
err = connIndex.Add(wc1)
|
||||||
connIndex.Add(wc3)
|
require.NoError(t, err)
|
||||||
|
err = connIndex.Add(wc3)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
assert.Len(t, connIndex.byConnectionId, 2)
|
assert.Len(t, connIndex.byConnectionId, 2)
|
||||||
assert.Equal(t, wc1, connIndex.ForConnection(wc1ID))
|
assert.Equal(t, wc1, connIndex.ForConnection(wc1ID))
|
||||||
@@ -380,9 +388,12 @@ func TestHubConnIndex(t *testing.T) {
|
|||||||
wc3.SetConnectionID(wc3ID)
|
wc3.SetConnectionID(wc3ID)
|
||||||
wc3.SetSession(&model.Session{})
|
wc3.SetSession(&model.Session{})
|
||||||
|
|
||||||
connIndex.Add(wc1)
|
err = connIndex.Add(wc1)
|
||||||
connIndex.Add(wc2)
|
require.NoError(t, err)
|
||||||
connIndex.Add(wc3)
|
err = connIndex.Add(wc2)
|
||||||
|
require.NoError(t, err)
|
||||||
|
err = connIndex.Add(wc3)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
t.Run("ForChannel", func(t *testing.T) {
|
t.Run("ForChannel", func(t *testing.T) {
|
||||||
require.Len(t, connIndex.byChannelID, 1)
|
require.Len(t, connIndex.byChannelID, 1)
|
||||||
@@ -450,9 +461,12 @@ func TestHubConnIndexIncorrectRemoval(t *testing.T) {
|
|||||||
wc4.SetConnectionID("last")
|
wc4.SetConnectionID("last")
|
||||||
wc4.SetSession(&model.Session{})
|
wc4.SetSession(&model.Session{})
|
||||||
|
|
||||||
connIndex.Add(wc2)
|
err := connIndex.Add(wc2)
|
||||||
connIndex.Add(wc3)
|
require.NoError(t, err)
|
||||||
connIndex.Add(wc4)
|
err = connIndex.Add(wc3)
|
||||||
|
require.NoError(t, err)
|
||||||
|
err = connIndex.Add(wc4)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
for _, wc := range connIndex.ForUser(wc2.UserId) {
|
for _, wc := range connIndex.ForUser(wc2.UserId) {
|
||||||
if !connIndex.Has(wc) {
|
if !connIndex.Has(wc) {
|
||||||
@@ -498,9 +512,12 @@ func TestHubConnIndexInactive(t *testing.T) {
|
|||||||
wc3.SetConnectionID("conn3")
|
wc3.SetConnectionID("conn3")
|
||||||
wc3.SetSession(&model.Session{})
|
wc3.SetSession(&model.Session{})
|
||||||
|
|
||||||
connIndex.Add(wc1)
|
err := connIndex.Add(wc1)
|
||||||
connIndex.Add(wc2)
|
require.NoError(t, err)
|
||||||
connIndex.Add(wc3)
|
err = connIndex.Add(wc2)
|
||||||
|
require.NoError(t, err)
|
||||||
|
err = connIndex.Add(wc3)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
assert.Nil(t, connIndex.RemoveInactiveByConnectionID(wc2.UserId, "conn2"))
|
assert.Nil(t, connIndex.RemoveInactiveByConnectionID(wc2.UserId, "conn2"))
|
||||||
assert.Equal(t, connIndex.ForUserActiveCount(wc2.UserId), 1)
|
assert.Equal(t, connIndex.ForUserActiveCount(wc2.UserId), 1)
|
||||||
@@ -511,7 +528,8 @@ func TestHubConnIndexInactive(t *testing.T) {
|
|||||||
assert.Len(t, connIndex.ForUser(wc2.UserId), 1)
|
assert.Len(t, connIndex.ForUser(wc2.UserId), 1)
|
||||||
|
|
||||||
wc3.lastUserActivityAt = model.GetMillis()
|
wc3.lastUserActivityAt = model.GetMillis()
|
||||||
connIndex.Add(wc3)
|
err = connIndex.Add(wc3)
|
||||||
|
require.NoError(t, err)
|
||||||
connIndex.RemoveInactiveConnections()
|
connIndex.RemoveInactiveConnections()
|
||||||
assert.True(t, connIndex.Has(wc3))
|
assert.True(t, connIndex.Has(wc3))
|
||||||
assert.Len(t, connIndex.ForUser(wc2.UserId), 2)
|
assert.Len(t, connIndex.ForUser(wc2.UserId), 2)
|
||||||
@@ -577,7 +595,8 @@ func TestHubIsRegistered(t *testing.T) {
|
|||||||
s := httptest.NewServer(dummyWebsocketHandler(t))
|
s := httptest.NewServer(dummyWebsocketHandler(t))
|
||||||
defer s.Close()
|
defer s.Close()
|
||||||
|
|
||||||
th.Service.Start(nil)
|
err = th.Service.Start(nil)
|
||||||
|
require.NoError(t, err)
|
||||||
wc1 := registerDummyWebConn(t, th, s.Listener.Addr(), session)
|
wc1 := registerDummyWebConn(t, th, s.Listener.Addr(), session)
|
||||||
wc2 := registerDummyWebConn(t, th, s.Listener.Addr(), session)
|
wc2 := registerDummyWebConn(t, th, s.Listener.Addr(), session)
|
||||||
wc3 := registerDummyWebConn(t, th, s.Listener.Addr(), session)
|
wc3 := registerDummyWebConn(t, th, s.Listener.Addr(), session)
|
||||||
@@ -612,7 +631,8 @@ func TestHubWebConnCount(t *testing.T) {
|
|||||||
s := httptest.NewServer(dummyWebsocketHandler(t))
|
s := httptest.NewServer(dummyWebsocketHandler(t))
|
||||||
defer s.Close()
|
defer s.Close()
|
||||||
|
|
||||||
th.Service.Start(nil)
|
err = th.Service.Start(nil)
|
||||||
|
require.NoError(t, err)
|
||||||
wc1 := registerDummyWebConn(t, th, s.Listener.Addr(), session)
|
wc1 := registerDummyWebConn(t, th, s.Listener.Addr(), session)
|
||||||
wc2 := registerDummyWebConn(t, th, s.Listener.Addr(), session)
|
wc2 := registerDummyWebConn(t, th, s.Listener.Addr(), session)
|
||||||
defer wc1.Close()
|
defer wc1.Close()
|
||||||
@@ -648,8 +668,10 @@ func BenchmarkHubConnIndex(b *testing.B) {
|
|||||||
b.ResetTimer()
|
b.ResetTimer()
|
||||||
b.Run("Add", func(b *testing.B) {
|
b.Run("Add", func(b *testing.B) {
|
||||||
for i := 0; i < b.N; i++ {
|
for i := 0; i < b.N; i++ {
|
||||||
connIndex.Add(wc1)
|
err := connIndex.Add(wc1)
|
||||||
connIndex.Add(wc2)
|
require.NoError(b, err)
|
||||||
|
err = connIndex.Add(wc2)
|
||||||
|
require.NoError(b, err)
|
||||||
|
|
||||||
b.StopTimer()
|
b.StopTimer()
|
||||||
connIndex.Remove(wc1)
|
connIndex.Remove(wc1)
|
||||||
@@ -661,8 +683,11 @@ func BenchmarkHubConnIndex(b *testing.B) {
|
|||||||
b.Run("Remove", func(b *testing.B) {
|
b.Run("Remove", func(b *testing.B) {
|
||||||
for i := 0; i < b.N; i++ {
|
for i := 0; i < b.N; i++ {
|
||||||
b.StopTimer()
|
b.StopTimer()
|
||||||
connIndex.Add(wc1)
|
err := connIndex.Add(wc1)
|
||||||
connIndex.Add(wc2)
|
require.NoError(b, err)
|
||||||
|
err = connIndex.Add(wc2)
|
||||||
|
require.NoError(b, err)
|
||||||
|
b.Error(err)
|
||||||
b.StartTimer()
|
b.StartTimer()
|
||||||
|
|
||||||
connIndex.Remove(wc1)
|
connIndex.Remove(wc1)
|
||||||
@@ -690,7 +715,8 @@ func TestHubConnIndexRemoveMemLeak(t *testing.T) {
|
|||||||
close(ch)
|
close(ch)
|
||||||
})
|
})
|
||||||
|
|
||||||
connIndex.Add(wc)
|
err := connIndex.Add(wc)
|
||||||
|
require.NoError(t, err)
|
||||||
connIndex.Remove(wc)
|
connIndex.Remove(wc)
|
||||||
|
|
||||||
runtime.GC()
|
runtime.GC()
|
||||||
@@ -713,7 +739,8 @@ func BenchmarkGetHubForUserId(b *testing.B) {
|
|||||||
th := Setup(b).InitBasic()
|
th := Setup(b).InitBasic()
|
||||||
defer th.TearDown()
|
defer th.TearDown()
|
||||||
|
|
||||||
th.Service.Start(nil)
|
err := th.Service.Start(nil)
|
||||||
|
require.NoError(b, err)
|
||||||
|
|
||||||
b.ResetTimer()
|
b.ResetTimer()
|
||||||
for i := 0; i < b.N; i++ {
|
for i := 0; i < b.N; i++ {
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user