fix

.github/workflows/test.yml

@@ -45,6 +45,28 @@ jobs:
   ci:
     runs-on: ubuntu-latest
     name: Test py${{ matrix.python-version }}/dj${{matrix.django-version}}
+
+    services:
+      db:
+        image: postgres
+        env:
+          POSTGRES_PASSWORD: pass
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
     defaults:
       run:
         shell: bash
@@ -91,6 +113,9 @@ jobs:
         if: needs.changes.outputs.run_tests
         run: |
           uv run pytest --create-db --junit-xml junit-${{ matrix.python-version }}-${{matrix.django-version}}.xml
+        env:
+          SECRET_KEY: "test-key"
+          DATABASE_URL: "psql://postgres:pass@localhost:5432/postgres"
 
       - name: Upload pytest test results
         uses: actions/upload-artifact@v4

pyproject.toml

@@ -69,7 +69,7 @@ dev-dependencies = [
     "pytest",
     "pytest-coverage",
     "pytest-django",
-    "pytest-echo",
+    "pytest-echo>=1.7.3",
     "pytest-ignore-flaky",
     "pytest-pythonpath",
     "responses",

pytest.ini

@@ -0,0 +1,19 @@
+[pytest]
+norecursedirs = data
+pythonpath = . src tests
+DJANGO_SETTINGS_MODULE = donor_reporting_portal.config.settings
+django_find_project = false
+addopts =
+        -v
+        --reuse-db
+        --tb=short
+        --maxfail=20
+        --echo-version=donor_reporting_portal
+        --echo-version=django
+        --capture=no
+        --cov-report=html
+        --cov-config=tests/.coveragerc
+        --cov=donor_reporting_portal
+
+markers =
+    slow: marks tests as slow (deselect with '-m "not slow"')

tests/_api_checker/api_checker/get_user.fixture.json

@@ -0,0 +1,26 @@
+{
+    "get_user": {
+        "master": {
+            "model": "core.user",
+            "pk": 26,
+            "fields": {
+                "password": "",
+                "last_login": null,
+                "is_superuser": true,
+                "username": "user999",
+                "first_name": "Suzanne",
+                "last_name": "Ferguson",
+                "email": "[email protected]",
+                "is_staff": false,
+                "is_active": true,
+                "date_joined": "2024-12-30T17:25:26.555Z",
+                "azure_id": null,
+                "job_title": null,
+                "display_name": "Suzanne Ferguson:",
+                "groups": [],
+                "user_permissions": []
+            }
+        },
+        "deps": []
+    }
+}

tests/api/_api_checker/test_config/test_api_config/_api_config_/get/dc937b59892604f5a86ac96936cd7ff09e25f18ae6b758e8014a24c7fa039e91.response.json

@@ -5,7 +5,7 @@
         "Vary": "Accept, Origin, Cookie",
         "Allow": "GET",
         "X-Frame-Options": "DENY",
-        "Content-Length": "256",
+        "Content-Length": "272",
         "X-Content-Type-Options": "nosniff",
         "Referrer-Policy": "same-origin",
         "Cross-Origin-Opener-Policy": "same-origin"

tests/api/_api_checker/test_security/test_api_user_profile/_api_roles_users_my_profile_/get/dc937b59892604f5a86ac96936cd7ff09e25f18ae6b758e8014a24c7fa039e91.response.json

@@ -11,7 +11,7 @@
         "Cross-Origin-Opener-Policy": "same-origin"
     },
     "data": {
-        "id": 135,
+        "id": 26,
         "username": "user999",
         "first_name": "Jennifer",
         "last_name": "Garcia",
@@ -37,4 +37,4 @@
         "roles": []
     },
     "content_type": "application/json"
-}
+}

tests/api/test_config.py

@@ -3,7 +3,7 @@
 import pytest
 from drf_api_checker.pytest import contract
 
-from tests.api_checker import LastModifiedRecorder
+from api_checker import LastModifiedRecorder
 
 
 @pytest.mark.django_db

tests/api/test_metadata.py

@@ -2,16 +2,16 @@
 
 from drf_api_checker.pytest import contract, frozenfixture
 
-from tests.api_checker import ExpectedErrorRecorder, LastModifiedRecorder
-from tests.factories import (
+from api_checker import ExpectedErrorRecorder, LastModifiedRecorder
+from factories import (
     DonorFactory,
     DRPMetadataFactory,
     ExternalGrantFactory,
     GrantFactory,
     ThemeFactory,
     UserRoleFactory,
 )
-from tests.perms import user_grant_permissions, user_grant_role_permission
+from perms import user_grant_permissions, user_grant_role_permission
 
 
 @frozenfixture()

tests/api/test_security.py

@@ -3,8 +3,8 @@
 import pytest
 from drf_api_checker.pytest import contract, frozenfixture
 
-from tests.api_checker import LastModifiedRecorder
-from tests.factories import BusinessAreaFactory, UserFactory, UserRoleFactory
+from api_checker import LastModifiedRecorder
+from factories import BusinessAreaFactory, UserFactory, UserRoleFactory
 
 
 @frozenfixture()

tests/api/test_sharepoint.py

@@ -5,16 +5,16 @@
 from drf_api_checker.pytest import api_checker_datadir, contract, frozenfixture  # noqa
 from drf_api_checker.recorder import Recorder
 
-from tests.api_checker import LastModifiedRecorder
-from tests.factories import (
+from api_checker import LastModifiedRecorder
+from factories import (
     DonorFactory,
     SharePointGroupFactory,
     SharePointLibraryFactory,
     SharePointSiteFactory,
     SharePointTenantFactory,
 )
-from tests.perms import user_grant_role_permission
-from tests.vcrpy import VCR
+from perms import user_grant_role_permission
+from vcrpy import VCR
 
 
 @frozenfixture()

tests/api_checker.py

@@ -8,7 +8,7 @@
 from rest_framework.response import Response
 from rest_framework.test import APIClient
 
-from tests.factories import UserFactory
+from factories import UserFactory
 
 
 def frozenfixture(fixture_name=default_fixture_name, is_fixture=True):

tests/apps/test_backends.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from tests.perms import user_grant_role_permission
+from perms import user_grant_role_permission
 
 
 @pytest.mark.django_db

tests/apps/test_roles.py

@@ -3,7 +3,7 @@
 from django.urls import reverse
 
 from donor_reporting_portal.apps.roles.models import UserRole
-from tests.factories import GroupFactory, UserRoleFactory
+from factories import GroupFactory, UserRoleFactory
 
 
 def test_admin_userrole(django_app, admin_user, userrole, donor, group, secondary_donor):

tests/apps/test_signals.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from tests.factories import GroupFactory
+from factories import GroupFactory
 
 
 @pytest.mark.django_db

tests/apps/test_synchronizers.py

@@ -4,7 +4,7 @@
 
 from donor_reporting_portal.apps.report_metadata.models import Donor, ExternalGrant, Grant
 from donor_reporting_portal.apps.report_metadata.synchronizers import GrantSynchronizer
-from tests.vcrpy import VCR
+from vcrpy import VCR
 
 
 @pytest.mark.django_db

tests/apps/vcr_cassettes/test_grant_sync.yml

@@ -15,7 +15,7 @@ interactions:
       User-Agent:
       - python-requests/2.22.0
     method: GET
-    uri: https://uniapis.unicef.org/biapi/v1/dsgrants
+    uri: http://invalid_vision_url/dsgrants
   response:
     body:
       string: "{\"ROWSET\":{\"ROW\":[{\"GRANT_REF\":\"ABV\",\"DESCRIPTION\":\"\

tests/conftest.py

@@ -6,7 +6,7 @@
 import pytest
 from rest_framework.test import APIClient
 
-from .factories import (
+from factories import (
     BusinessAreaFactory,
     DonorFactory,
     ExternalGrantFactory,
@@ -21,15 +21,16 @@
 
 
 def pytest_configure(config):
-    # enable this to remove deprecations
     os.environ["SECRET_KEY"] = "6311bc92d3d1ebf12ae2aa54d8aaeeafa9e8cdb4"
     os.environ["CELERY_TASK_ALWAYS_EAGER"] = "1"
     os.environ["STATIC_ROOT"] = tempfile.gettempdir()
 
 
 @pytest.fixture(autouse=True)
 def use_override_settings(settings):
-    settings.SECRET_KEY = "6311bc92d3d1ebf12ae2aa54d8aaeeafa9e8cdb4"
+    os.environ["SECRET_KEY"] = "6311bc92d3d1ebf12ae2aa54d8aaeeafa9e8cdb4"
+    os.environ["CELERY_TASK_ALWAYS_EAGER"] = "1"
+    os.environ["STATIC_ROOT"] = tempfile.gettempdir()
 
 
 @pytest.fixture(scope="session")

tests/factories/roles.py

@@ -7,7 +7,7 @@
 
 from donor_reporting_portal.apps.core.models import User
 from donor_reporting_portal.apps.roles.models import UserRole
-from tests.factories import DonorFactory
+from factories import DonorFactory
 
 
 class GroupFactory(factory.django.DjangoModelFactory):

tests/perms.py

@@ -11,7 +11,7 @@
 
 from donor_reporting_portal.apps.roles.models import UserRole
 
-from .factories import GroupFactory
+from factories import GroupFactory
 
 whitespace = " \t\n\r\v\f"
 lowercase = "abcdefghijklmnopqrstuvwxyz"