From 0167f884b49c5a144586841d06c9e1e507dbc886 Mon Sep 17 00:00:00 2001 From: Rob Mulholand Date: Thu, 31 Oct 2019 13:05:19 -0500 Subject: [PATCH] Enable configuring db user, host, and port in tests --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 8e5d714a..fc031472 100644 --- a/Makefile +++ b/Makefile @@ -41,9 +41,16 @@ metalint: | $(METALINT) lint: $(LINT) $$($(PKGS)) | grep -v -E "exported (function)|(var)|(method)|(type).*should have comment or be unexported" +#Database +HOST_NAME = localhost +PORT = 5432 +NAME = +USER = postgres +CONNECT_STRING=postgresql://$(USER)@$(HOST_NAME):$(PORT)/$(NAME)?sslmode=disable + #Test TEST_DB = vulcanize_testing -TEST_CONNECT_STRING = postgresql://postgres@localhost:5432/$(TEST_DB)?sslmode=disable +TEST_CONNECT_STRING = postgresql://$(USER)@$(HOST_NAME):$(PORT)/$(TEST_DB)?sslmode=disable .PHONY: test test: | $(GINKGO) $(LINT) @@ -71,13 +78,6 @@ build: go fmt ./... go build -#Database -HOST_NAME = localhost -PORT = 5432 -NAME = -USER = postgres -CONNECT_STRING=postgresql://$(USER)@$(HOST_NAME):$(PORT)/$(NAME)?sslmode=disable - # Parameter checks ## Check that DB variables are provided .PHONY: checkdbvars