removed unclean init of tests within make file, and made the process …

…of starting tests cleaner
ministryofjustice · Apr 8, 2024 · 512ea29 · 512ea29
1 parent 5e3d5e8
commit 512ea29
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 25 deletions.
diff --git a/Makefile b/Makefile
@@ -57,9 +57,6 @@ run: ## Build dev image and start dhcp container
 
 .PHONY: test
 test: ## Build dev container, start dhcp container, run tests
-	$(MAKE) run
-	$(MAKE) build-dev
-	./scripts/wait_for_dhcp_server.sh
 	$(DOCKER_COMPOSE) run --rm dhcp-test rspec -f d ./spec
 
 .PHONY: shell

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -86,8 +86,10 @@ services:
       DB_PORT: 3306
       METRICS_NAMESPACE: "Kea-DHCP"
     depends_on:
-      - db
-      - dhcp-primary
+      db:
+        condition: service_healthy
+      dhcp-primary:
+        condition: service_started
     ports:
       - 68:68/udp
     volumes:

diff --git a/scripts/wait_for_dhcp_server.sh b/scripts/wait_for_dhcp_server.sh