add initial testing

asapdiscovery · Feb 8, 2024 · 472a5f7 · 472a5f7
1 parent 1632b52
commit 472a5f7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -49,11 +49,6 @@ jobs:
           docker-compose -f docker-compose-dev.yml up -d
           docker container ls
 
-      # - name: wait for containers to start
-      #   run: |
-      #     sleep 30
-      #     docker container ls
-
       - name: Run tests
         run: |
           docker-compose -f docker-compose-dev.yml exec -T web bash -c "cd argos && /opt/conda/bin/python manage.py test"
diff --git a/argos/argos_viewer/tests.py b/argos/argos_viewer/tests.py
@@ -6,5 +6,3 @@ class BlankTest(TestCase):
     def test_placeholder(self):
         self.assertEqual(1, 1)
 
-    def test_fail(self):
-        self.assertEqual(1,2)
diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
@@ -17,7 +17,8 @@ services:
     env_file:
       - .env
     depends_on:
-      - db
+      db:
+        condition: service_healthy
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.django.rule=Host(`${HOST_DOMAIN:?err}`)"
@@ -27,6 +28,13 @@ services:
 
   db:
     image: postgres:15-alpine
+
+    healthcheck:
+      test: pg_isready
+      interval: 5s
+      timeout: 10s
+      retries: 120
+
     volumes:
       - postgres_data_prod:/var/lib/postgresql/data/
     expose: