Skip to content

Commit

Permalink
Use correct test name
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Gilmer committed Oct 7, 2019
1 parent 8f579ff commit 59fb44e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .circleci/config.yml
Expand Up @@ -418,6 +418,7 @@ jobs:
DB_PORT_TEST: 5433
DB_PORT: 5432
DB_NAME: test_db
DB_NAME_TEST: test_db
EIA_KEY: db2522a43820268a41a802a16ae9fd26 # dummy key generated with openssl rand -hex 16
ENV: test
ENVIRONMENT: test
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Expand Up @@ -394,11 +394,11 @@ server_test_standalone: ## Run server unit tests with no deps
# Pass `-short` to exclude long running tests
# Disable test caching with `-count 1` - caching was masking local test failures
ifndef CIRCLECI
DB_PORT=$(DB_PORT_TEST) go test -count 1 -short $$(go list ./... | grep -v \\/pkg\\/gen\\/ | grep -v \\/cmd\\/ | grep -v mocks)
DB_NAME=$(DB_NAME_TEST) DB_PORT=$(DB_PORT_TEST) go test -count 1 -short $$(go list ./... | grep -v \\/pkg\\/gen\\/ | grep -v \\/cmd\\/ | grep -v mocks)
else
# Limit the maximum number of tests to run in parallel to 8 for CircleCI due to memory constraints.
# Add verbose (-v) so go-junit-report can parse it for CircleCI results
DB_PORT=$(DB_PORT_TEST) go test -v -parallel 8 -count 1 -short $$(go list ./... | grep -v \\/pkg\\/gen\\/ | grep -v \\/cmd\\/ | grep -v mocks)
DB_NAME=$(DB_NAME_TEST) DB_PORT=$(DB_PORT_TEST) go test -v -parallel 8 -count 1 -short $$(go list ./... | grep -v \\/pkg\\/gen\\/ | grep -v \\/cmd\\/ | grep -v mocks)
endif

server_test_build:
Expand Down
2 changes: 1 addition & 1 deletion pkg/testingsuite/pop_suite.go
Expand Up @@ -105,7 +105,7 @@ func NewPopTestSuite(packageName PackageName) PopTestSuite {
}

dbDialect := "postgres"
dbNameTest := envy.MustGet("DB_NAME_TEST")
dbNameTest := envy.MustGet("DB_NAME")
dbHost := envy.MustGet("DB_HOST")
dbPort := envy.MustGet("DB_PORT_TEST")
dbUser := envy.MustGet("DB_USER")
Expand Down

0 comments on commit 59fb44e

Please sign in to comment.