test: Re-enabled the basic unit tests

xchem · Dec 8, 2023 · 5cbd0c5 · 5cbd0c5
1 parent c41587f
commit 5cbd0c5
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 816 deletions.
diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml
@@ -93,17 +93,15 @@ jobs:
       with:
         context: .
         tags: ${{ steps.vars.outputs.BE_NAMESPACE }}/fragalysis-backend:${{ env.GITHUB_REF_SLUG }}
-# DEVELOPER TESTING DISABLED UNTIL MODEL-REFACTORING IS COMPLETE
-#
-#    - name: Test
-#      run: >
-#        docker-compose -f docker-compose.test.yml up
-#        --build
-#        --exit-code-from tests
-#        --abort-on-container-exit
-#      env:
-#        BE_NAMESPACE: ${{ steps.vars.outputs.BE_NAMESPACE }}
-#        BE_IMAGE_TAG: ${{ env.GITHUB_REF_SLUG }}
+    - name: Test
+      run: >
+        docker-compose -f docker-compose.test.yml up
+        --build
+        --exit-code-from tests
+        --abort-on-container-exit
+      env:
+        BE_NAMESPACE: ${{ steps.vars.outputs.BE_NAMESPACE }}
+        BE_IMAGE_TAG: ${{ env.GITHUB_REF_SLUG }}
     - name: Login to DockerHub
       if: steps.vars.outputs.push == 'true'
       uses: docker/login-action@v2

diff --git a/.github/workflows/build-production.yaml b/.github/workflows/build-production.yaml
@@ -139,15 +139,15 @@ jobs:
         tags: |
           ${{ steps.vars.outputs.BE_NAMESPACE }}/fragalysis-backend:${{ steps.vars.outputs.tag }}
           ${{ steps.vars.outputs.BE_NAMESPACE }}/fragalysis-backend:stable
-#    - name: Test
-#      run: >
-#        docker-compose -f docker-compose.test.yml up
-#        --build
-#        --exit-code-from tests
-#        --abort-on-container-exit
-#      env:
-#        BE_NAMESPACE: ${{ steps.vars.outputs.BE_NAMESPACE }}
-#        BE_IMAGE_TAG: ${{ steps.vars.outputs.tag }}
+    - name: Test
+      run: >
+        docker-compose -f docker-compose.test.yml up
+        --build
+        --exit-code-from tests
+        --abort-on-container-exit
+      env:
+        BE_NAMESPACE: ${{ steps.vars.outputs.BE_NAMESPACE }}
+        BE_IMAGE_TAG: ${{ steps.vars.outputs.tag }}
     - name: Login to DockerHub
       if: steps.vars.outputs.push == 'true'
       uses: docker/login-action@v2

diff --git a/.github/workflows/build-staging.yaml b/.github/workflows/build-staging.yaml
@@ -159,15 +159,15 @@ jobs:
       with:
         context: .
         tags: ${{ steps.vars.outputs.BE_NAMESPACE }}/fragalysis-backend:${{ steps.vars.outputs.tag }}
-#    - name: Test
-#      run: >
-#        docker-compose -f docker-compose.test.yml up
-#        --build
-#        --exit-code-from tests
-#        --abort-on-container-exit
-#      env:
-#        BE_NAMESPACE: ${{ steps.vars.outputs.BE_NAMESPACE }}
-#        BE_IMAGE_TAG: ${{ steps.vars.outputs.tag }}
+    - name: Test
+      run: >
+        docker-compose -f docker-compose.test.yml up
+        --build
+        --exit-code-from tests
+        --abort-on-container-exit
+      env:
+        BE_NAMESPACE: ${{ steps.vars.outputs.BE_NAMESPACE }}
+        BE_IMAGE_TAG: ${{ steps.vars.outputs.tag }}
     - name: Login to DockerHub
       if: steps.vars.outputs.push == 'true'
       uses: docker/login-action@v3

diff --git a/docker-compose.edit.yml b/docker-compose.edit.yml
@@ -29,7 +29,7 @@ version: '3'
 services:
 
   database:
-    image: postgres:12.2
+    image: postgres:12.16-alpine3.18
     volumes:
     - ../django_data:/var/lib/postgresql/data
     environment:

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -4,7 +4,7 @@ version: '3'
 services:
 
   database:
-    image: postgres:12.2
+    image: postgres:12.16-alpine3.18
     volumes:
     - ../django_data:/var/lib/postgresql/data
     environment:

diff --git a/test-entry.sh b/test-entry.sh
@@ -4,4 +4,4 @@ export ISPYB_FLAG=""
 # Run tests that don't require a 'test' database - i.e. unit-level tests
 python manage.py test --settings tests.nodb_settings --tag nodb
 # Test everything else...
-python manage.py test --exclude-tag nodb --no-input
+python manage.py test --exclude-tag nodb --exclude-tag broken --no-input