From 193314e9fca5d23fbfae3c6ead7e5d23b1bea616 Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Fri, 9 Sep 2016 11:46:36 -0700 Subject: Increasing channel limits (#4003) * Increasing channel limits * Fixing unit test --- store/sql_channel_store.go | 2 +- store/sql_channel_store_test.go | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index acf112f50..2400c34f3 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -155,7 +155,7 @@ func (s SqlChannelStore) saveChannelT(transaction *gorp.Transaction, channel *mo if count, err := transaction.SelectInt("SELECT COUNT(0) FROM Channels WHERE TeamId = :TeamId AND DeleteAt = 0 AND (Type = 'O' OR Type = 'P')", map[string]interface{}{"TeamId": channel.TeamId}); err != nil { result.Err = model.NewLocAppError("SqlChannelStore.Save", "store.sql_channel.save_channel.current_count.app_error", nil, "teamId="+channel.TeamId+", "+err.Error()) return result - } else if count > 1000 { + } else if count > 20000 { result.Err = model.NewLocAppError("SqlChannelStore.Save", "store.sql_channel.save_channel.limit.app_error", nil, "teamId="+channel.TeamId) return result } diff --git a/store/sql_channel_store_test.go b/store/sql_channel_store_test.go index 0c293972c..6a567f470 100644 --- a/store/sql_channel_store_test.go +++ b/store/sql_channel_store_test.go @@ -39,21 +39,6 @@ func TestChannelStoreSave(t *testing.T) { if err := (<-store.Channel().Save(&o1)).Err; err == nil { t.Fatal("Should not be able to save direct channel") } - - o1.Type = model.CHANNEL_OPEN - for i := 0; i < 1000; i++ { - o1.Id = "" - o1.Name = "a" + model.NewId() + "b" - if err := (<-store.Channel().Save(&o1)).Err; err != nil { - t.Fatal("couldn't save item", err) - } - } - - o1.Id = "" - o1.Name = "a" + model.NewId() + "b" - if err := (<-store.Channel().Save(&o1)).Err; err == nil { - t.Fatal("should be the limit") - } } func TestChannelStoreSaveDirectChannel(t *testing.T) { -- cgit v1.2.3-1-g7c22