Skip to content

Patch makefile in example dir #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sueszli wants to merge 1 commit into from
Closed

Patch makefile in example dir #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions example_app/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,17 @@ docker-test:
@echo "Running tests in docker-compose environment (timeout $(DOCKER_TEST_TIMEOUT)s)"
$(COMPOSE_CMD) up -d postgres daemons
@echo "Waiting for postgres to be healthy..."
@timeout 30 sh -c 'until docker compose exec postgres pg_isready -U waymark > /dev/null 2>&1; do sleep 1; done' || (echo "Postgres failed to become healthy" && exit 1)
@echo "Waiting for workers to be ready..."
@sleep 3
@echo "Checking that daemons are running and ready..."
@timeout 60 sh -c 'until $(COMPOSE_CMD) ps --status=running --services | grep -q "^daemons$$"; do sleep 1; done' || (echo "Daemons failed to stay running" && $(COMPOSE_CMD) logs daemons || true; $(COMPOSE_CMD) down -v; exit 1)
@timeout 60 sh -c 'until $(COMPOSE_CMD) exec -T daemons python -c "import socket; s = socket.create_connection((\"127.0.0.1\", 24118), 1); s.close()" >/dev/null 2>&1; do sleep 1; done' || (echo "Daemons never opened worker bridge port 24118" && $(COMPOSE_CMD) logs daemons || true; $(COMPOSE_CMD) down -v; exit 1)
@set -e; \
TEST_EXIT_CODE=0; \
timeout $(DOCKER_TEST_TIMEOUT) $(COMPOSE_CMD) run --rm -e WAYMARK_DATABASE_URL=postgresql://waymark:waymark@postgres:5432/waymark_example webapp pytest -vvv || TEST_EXIT_CODE=$$?; \
@until $(COMPOSE_CMD) exec -T postgres pg_isready -U waymark >/dev/null 2>&1; do sleep 1; done
@echo "Waiting for worker bridge port 24118 to be ready..."
@until $(COMPOSE_CMD) exec -T daemons python -c "import socket; s = socket.create_connection(('127.0.0.1', 24118), 1); s.close()" >/dev/null 2>&1; do sleep 1; done
@TEST_EXIT_CODE=0; \
timeout $(DOCKER_TEST_TIMEOUT) $(COMPOSE_CMD) run -T --rm -e WAYMARK_DATABASE_URL=postgresql://waymark:waymark@postgres:5432/waymark_example webapp pytest -vvv </dev/null || TEST_EXIT_CODE=$$?; \
echo ""; \
echo "=== Daemon Logs ==="; \
$(COMPOSE_CMD) logs --tail=$(DOCKER_LOG_TAIL) daemons || true; \
echo ""; \
echo "=== Webapp Logs ==="; \
$(COMPOSE_CMD) logs --tail=$(DOCKER_LOG_TAIL) webapp || true; \
echo ""; \
$(COMPOSE_CMD) down -v; \
$(COMPOSE_CMD) down -v || true; \
exit $$TEST_EXIT_CODE
2 changes: 0 additions & 2 deletions example_app/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.9"

x-app-build: &app-build
context: ..
dockerfile: example_app/Dockerfile
Expand Down