From be30d74c20a25fba4f7669058b434a3449e17da9 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Tue, 22 Mar 2016 11:35:39 -0400
Subject: [PATCH] Removing static test. Adding start-docker as a dep for
 run-server.

---
 Makefile        | 2 +-
 web/web_test.go | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 5bb64638ae..492275ecac 100644
--- a/Makefile
+++ b/Makefile
@@ -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 8305ca34e4..8dde5d7470 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()