Merge branch 'master' into mark-as-unread

api4/system_test.go

@@ -383,7 +383,7 @@ func TestGetAnalyticsOld(t *testing.T) {
 	rows2, resp2 = th.SystemAdminClient.GetAnalyticsOld("standard", "")
 	CheckNoError(t, resp2)
 	assert.Equal(t, "total_websocket_connections", rows2[5].Name)
-	assert.Equal(t, float64(1), rows2[5].Value)
+	assert.Equal(t, float64(th.App.TotalWebsocketConnections()), rows2[5].Value)
 
 	WebSocketClient.Close()