Merge pull request #1110 from timstclair/httptest

Stop leaking testing dependencies (and flags) in non-testing builds

Makefile

@@ -18,7 +18,7 @@ all: format build test
 
 test:
 	@echo ">> running tests"
-	@$(GO) test -short -race $(pkgs)
+	@$(GO) test -tags test -short -race $(pkgs)
 
 test-integration: build test
 	@./build/integration.sh

build/presubmit.sh

@@ -20,5 +20,5 @@ set -x
 ./build/check_gofmt.sh .
 ./build/check_boilerplate.sh
 go vet github.com/google/cadvisor/...
-godep go test -v -race -test.short github.com/google/cadvisor/...
+godep go test -tags test -v -race -test.short github.com/google/cadvisor/...
 godep go build github.com/google/cadvisor

container/mock.go

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build test
+
 package container
 
 import (

manager/manager_mock.go

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build test
+
 package manager
 
 import (