diff options
| author | Corey Hulen <corey@hulen.com> | 2016-03-23 07:37:29 -0700 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-03-23 07:37:29 -0700 |
| commit | c7dbffec4dc11fe13b720ae0cd18afcb5b2f6bbd (patch) | |
| tree | 0310a1f622d0f9c75a111efad59f73889eb5ab2c | |
| parent | 18b8ae5298f50161ffa55b6d8576a5438fe0091a (diff) | |
| parent | be30d74c20a25fba4f7669058b434a3449e17da9 (diff) | |
| download | chat-c7dbffec4dc11fe13b720ae0cd18afcb5b2f6bbd.tar.gz chat-c7dbffec4dc11fe13b720ae0cd18afcb5b2f6bbd.tar.bz2 chat-c7dbffec4dc11fe13b720ae0cd18afcb5b2f6bbd.zip | |
Merge pull request #2508 from mattermost/mf-fixes
Removing static test. Adding start-docker as a dep for run-server.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | web/web_test.go | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -174,7 +174,7 @@ endif # Create package tar -C dist -czf $(DIST_PATH).tar.gz mattermost -run-server: prepare-enterprise +run-server: prepare-enterprise start-docker @echo Running mattermost for development mkdir -p $(BUILD_WEBAPP_DIR)/dist/files diff --git a/web/web_test.go b/web/web_test.go index 8305ca34e..8dde5d747 100644 --- a/web/web_test.go +++ b/web/web_test.go @@ -4,7 +4,6 @@ package web import ( - "net/http" "net/url" "strings" "testing" @@ -40,6 +39,7 @@ func TearDown() { } } +/* Test disabled for now so we don't requrie the client to build. Maybe re-enable after client gets moved out. func TestStatic(t *testing.T) { Setup() @@ -54,6 +54,7 @@ func TestStatic(t *testing.T) { t.Fatalf("couldn't get static files %v", resp.StatusCode) } } +*/ func TestGetAccessToken(t *testing.T) { Setup() |