Merge pull request #927 from hackforla/more-clean-up

More clean up
hackforla · Feb 3, 2021 · d97eff9 · d97eff9
2 parents 41d9ad1 + fb077dc
commit d97eff9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/.github/workflows/build_test_backend.yml b/.github/workflows/build_test_backend.yml
@@ -13,12 +13,19 @@ jobs:
         run: |
           cp .env.example .env
           docker-compose up --no-start api
-      - name: Seed database and run API
+      - name: Run API (w/docker debugging)
         run: |
           docker-compose up -d api
-      - name: Run unit tests
-        run: docker-compose run api pytest
+          docker ps -a
+          docker network inspect 311_data_default
+          nc -zv localhost 5432
+          docker-compose logs db
+          docker-compose logs api
       - name: Lint API
         run: docker-compose run api flake8
+      - name: Seed the test database
+        run: docker-compose run -e TESTING=True api alembic upgrade head
+      - name: Run unit tests
+        run: docker-compose run api pytest
       # - name: Run Postman tests
       #   run: chmod +x postman/test.sh && postman/test.sh
diff --git a/server/.env.example b/server/.env.example
@@ -21,6 +21,7 @@ DB_USER=311_user
 DB_PASS=311_pass
 DB_NAME=311_db_test
 DB_ECHO=False
+SHOW_ENV=False
 
 ############################ PREFECT CONFIG ##############################
 

diff --git a/server/api/.coverage b/server/api/.coverage
diff --git a/server/api/start_api.sh b/server/api/start_api.sh
diff --git a/server/docker-compose.yml b/server/docker-compose.yml
@@ -35,8 +35,6 @@ services:
       - target: ${APP_PORT}
         published: ${API_HOST_PORT}
     command: gunicorn lacity_data_api.asgi:app -w 4 -k uvicorn.workers.UvicornWorker --log-level info -b 0.0.0.0:5000
-    # volumes:
-    #   - ./api/:/home/api
     depends_on:
       - db
       - redis
@@ -50,7 +48,6 @@ services:
       PREFECT__API_URL: ${APP_PROTOCOL}://${APP_HOST}:${APP_PORT}
     depends_on:
       - db
-    # entrypoint: python flow.py
 
 volumes:
   backend_data: