diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-04-28 10:56:19 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-04-28 10:56:19 -0400 |
| commit | 383cddd3d14107fabea28e09f5f9401623cd19d5 (patch) | |
| tree | f0aedc438756bf41aa29aa5f3518e83f40e95da1 /Makefile | |
| parent | 3dbb5ab4cca74de7d7a00909927e1f034949052d (diff) | |
| download | chat-383cddd3d14107fabea28e09f5f9401623cd19d5.tar.gz chat-383cddd3d14107fabea28e09f5f9401623cd19d5.tar.bz2 chat-383cddd3d14107fabea28e09f5f9401623cd19d5.zip | |
Don't return error if already part of channel being joined (#2814)
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -143,7 +143,7 @@ check-style: test: start-docker @echo Running tests - $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=240s ./api || exit 1 + $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=340s ./api || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=12s ./model || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./store || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./utils || exit 1 |