summaryrefslogtreecommitdiffstats
path: root/api/channel_test.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-05-06 08:06:34 -0400
committerChristopher Speller <crspeller@gmail.com>2016-05-06 08:06:34 -0400
commitd75cb0294896e0e45f280cbccde8581376d501ce (patch)
tree0d82a1d959945aa2a2e73633233d9c681212f209 /api/channel_test.go
parent4b2843ee9d513a6b464e1e581e9cee8baaaa4317 (diff)
downloadchat-d75cb0294896e0e45f280cbccde8581376d501ce.tar.gz
chat-d75cb0294896e0e45f280cbccde8581376d501ce.tar.bz2
chat-d75cb0294896e0e45f280cbccde8581376d501ce.zip
Multiple cross-team functionality fixes (#2902)
Diffstat (limited to 'api/channel_test.go')
-rw-r--r--api/channel_test.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/api/channel_test.go b/api/channel_test.go
index 31b201346..69902c3ad 100644
--- a/api/channel_test.go
+++ b/api/channel_test.go
@@ -113,8 +113,9 @@ func TestCreateDirectChannel(t *testing.T) {
t.Fatal("channel type was not direct")
}
- if _, err := Client.CreateDirectChannel(th.BasicUser2.Id); err == nil {
- t.Fatal("channel already exists and should have failed")
+ // don't fail on direct channels already existing
+ if _, err := Client.CreateDirectChannel(th.BasicUser2.Id); err != nil {
+ t.Fatal(err)
}
if _, err := Client.CreateDirectChannel("junk"); err == nil {