fixup! feat(dev): add local api test runner

Author: nils-wisiol

run-api-tests-stack.sh

@@ -3,10 +3,8 @@ set -euo pipefail
 
 ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 COMPOSE="docker compose -f ${ROOT_DIR}/docker-compose.yml -f ${ROOT_DIR}/docker-compose.test-api.yml"
-BUILD_IMAGES_STACK=(api dbapi nslord nsmaster dblord dbmaster)
 BUILD_IMAGES_DB=(dbapi)
 BUILD=1
-MODE="host"
 PROD_DB=0
 PROD_USER="root"
 PROD_HOST="digga.desec.io"
@@ -16,9 +14,8 @@ CACHE_FILE="${CACHE_DIR}/dbapi.sql.gz"
 
 usage() {
   cat <<'EOF'
-Usage: ./run-api-tests-stack.sh [--no-build] [--docker] [--prod-db] [--prod-user USER] [--prod-host HOST] [--refresh-prod-db]
+Usage: ./run-api-tests-stack.sh [--no-build] [--prod-db] [--prod-user USER] [--prod-host HOST] [--refresh-prod-db]
   --no-build  Skip docker image build step
-  --docker    Run API tests inside the api container (CI-style)
   --prod-db   Download a logical dbapi dump from production and load it locally
   --prod-user SSH username for prod (default: root)
   --prod-host SSH hostname for prod (default: desec.io)
@@ -29,7 +26,6 @@ EOF
 while [[ $# -gt 0 ]]; do
   case "$1" in
     --no-build) BUILD=0 ;;
-    --docker) MODE="docker" ;;
     --prod-db) PROD_DB=1 ;;
     --prod-user)
       shift
@@ -106,59 +102,48 @@ cleanup() {
 
 trap cleanup EXIT
 
-if [[ "$MODE" == "docker" ]]; then
-  if [[ "$PROD_DB" -eq 1 ]]; then
-    echo "--prod-db is only supported for host-mode tests." >&2
+if [[ "$BUILD" -eq 1 ]]; then
+  $COMPOSE build "${BUILD_IMAGES_DB[@]}"
+fi
+$COMPOSE up -d dbapi
+(
+  set -a
+  source "${ROOT_DIR}/.env"
+  set +a
+  export DJANGO_SETTINGS_MODULE=api.settings_quick_test
+  export DESECSTACK_DJANGO_TEST=1
+  cd "${ROOT_DIR}/api"
+  if [[ -x "./venv/bin/python" ]]; then
+    # Use project venv when present.
+    source "./venv/bin/activate"
+  else
+    echo "Missing venv at ${ROOT_DIR}/api/venv. Create it with: cd api && python3 -m venv venv && source venv/bin/activate && pip install -r requirements.txt" >&2
     exit 1
   fi
-  if [[ "$BUILD" -eq 1 ]]; then
-    $COMPOSE build "${BUILD_IMAGES_STACK[@]}"
-  fi
-  $COMPOSE run --rm api bash -c "./entrypoint-tests.sh"
-else
-  if [[ "$BUILD" -eq 1 ]]; then
-    $COMPOSE build "${BUILD_IMAGES_DB[@]}"
-  fi
-  $COMPOSE up -d dbapi
-  (
-    set -a
-    source "${ROOT_DIR}/.env"
-    set +a
-    export DJANGO_SETTINGS_MODULE=api.settings_quick_test
-    export DESECSTACK_DJANGO_TEST=1
-    cd "${ROOT_DIR}/api"
-    if [[ -x "./venv/bin/python" ]]; then
-      # Use project venv when present.
-      source "./venv/bin/activate"
-    else
-      echo "Missing venv at ${ROOT_DIR}/api/venv. Create it with: cd api && python3 -m venv venv && source venv/bin/activate && pip install -r requirements.txt" >&2
-      exit 1
+  # Avoid local psql dependency by checking readiness inside the DB container.
+  wait_seconds=120
+  start_ts=$(date +%s)
+  while true; do
+    if $COMPOSE exec -T dbapi pg_isready >/dev/null 2>&1; then
+      break
     fi
-    # Avoid local psql dependency by checking readiness inside the DB container.
-    wait_seconds=120
-    start_ts=$(date +%s)
-    while true; do
-      if $COMPOSE exec -T dbapi pg_isready >/dev/null 2>&1; then
-        break
-      fi
 
-      now_ts=$(date +%s)
-      if (( now_ts - start_ts > wait_seconds )); then
-        echo "Timed out waiting for Postgres to become ready."
-        $COMPOSE ps
-        $COMPOSE logs --tail 80 dbapi || true
-        exit 1
-      fi
-      echo "Postgres is unavailable - sleeping"
-      sleep 2
-    done
-    test_args=()
-    if [[ "$PROD_DB" -eq 1 ]]; then
-      download_prod_dbapi
-      restore_dbapi_from_cache
-      export DESECSTACK_DJANGO_TEST_DB_NAME=desec
-      test_args+=(--keepdb)
+    now_ts=$(date +%s)
+    if (( now_ts - start_ts > wait_seconds )); then
+      echo "Timed out waiting for Postgres to become ready."
+      $COMPOSE ps
+      $COMPOSE logs --tail 80 dbapi || true
+      exit 1
     fi
-    python3 manage.py test "${test_args[@]}"
-  )
-fi
+    echo "Postgres is unavailable - sleeping"
+    sleep 2
+  done
+  test_args=()
+  if [[ "$PROD_DB" -eq 1 ]]; then
+    download_prod_dbapi
+    restore_dbapi_from_cache
+    export DESECSTACK_DJANGO_TEST_DB_NAME=desec
+    test_args+=(--keepdb)
+  fi
+  python3 manage.py test "${test_args[@]}"
+)