backend: Update Make file to use docker compose for tests

This patch updates the make file to use the docker compose file for tests instead of the shell scripts and docker commands. Signed-off-by: Santhosh Nagaraj S <[email protected]>
flatcar · Jan 11, 2022 · d5dc961 · d5dc961
1 parent bbd0394
commit d5dc961
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/backend/Makefile b/backend/Makefile
@@ -30,19 +30,18 @@ coverage.out: check-code-coverage
 check-code-coverage:
 	go test -p 1 -coverprofile=coverage.out ./...
 
-container_id:
-	./tools/setup_local_db.sh \
-		--id-file container_id.tmp \
-		--db-name nebraska_tests \
-		--password nebraska \
-		--pg-version 13.3
-	mv container_id.tmp container_id
+.PHONY: test-service-up
+test-service-up:
+	docker compose -f ./docker-compose.test.yaml up -d
+
+.PHONY: test-service-down
+test-service-down:
+	docker compose -f ./docker-compose.test.yaml down
 
 .PHONY: check-backend-with-container
-check-backend-with-container: container_id
-	set -e; \
-	trap "$(DOCKER_CMD) kill $$(cat container_id); $(DOCKER_CMD) rm $$(cat container_id); rm -f container_id" EXIT; \
-	go test -p 1 ./...
+check-backend-with-container: test-service-up
+	go clean -testcache && go test -p 1 ./...
+	$(MAKE) test-service-down
 
 run: bin/nebraska
 	./bin/nebraska -auth-mode noop -debug

diff --git a/backend/test/api/docker-compose.test.yaml → backend/docker-compose.test.yaml b/backend/test/api/docker-compose.test.yaml → backend/docker-compose.test.yaml
@@ -18,7 +18,7 @@ services:
 
   server:
     build: 
-      context: ../../../
+      context: ../
       dockerfile: Dockerfile
     ports:
       - "8000:8000"