Fix salesforce tests to run sequentially

Author: axelstudios

.github/workflows/ci.yml

@@ -89,7 +89,7 @@ jobs:
           DJANGO_LOG_LEVEL: ERROR
         run: |
           docker exec seed_web touch /seed/config/settings/local_untracked.py
-          docker exec --env SEED_PM_UN --env SEED_PM_PW --env DJANGO_LOG_LEVEL --env SF_INSTANCE --env SF_USERNAME --env SF_PASSWORD --env SF_SECURITY_TOKEN --env SF_DOMAIN seed_web /bin/bash -lc 'uv run coverage run manage.py test --settings=config.settings.docker_test --parallel="$(nproc)"'
+          docker exec --env SEED_PM_UN --env SEED_PM_PW --env DJANGO_LOG_LEVEL --env SF_INSTANCE --env SF_USERNAME --env SF_PASSWORD --env SF_SECURITY_TOKEN --env SF_DOMAIN seed_web /bin/bash -lc 'uv run coverage run manage.py test --settings=config.settings.docker_test --parallel="$(nproc)" --verbosity=2'
           if [[ ! -z "${COVERALLS_REPO_TOKEN}" ]]; then
             docker exec --env COVERALLS_REPO_TOKEN seed_web uv run coveralls
           else

pyproject.toml

@@ -65,7 +65,7 @@ dependencies = [
     # Integrations
     "buildingsync-asset-extractor==0.3.0", # BuildingSync Asset Extractor (includes lxml dependency required by SEED)
     "tkbl==0.7",
-    "seed-salesforce==0.1.1",
+    "seed-salesforce==0.2.0",
     "simple-salesforce==1.12.9",
     # Compatibility / backports
     "importlib-metadata==8.7.1", # Remove once a version newer than 8.5.0 has been released that fixes Django autoreload

seed/__init__.py

@@ -5,6 +5,6 @@
 
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
-from .celery import app as celery_app
+from .celery_app import app as celery_app
 
 __all__ = ("celery_app",)

seed/celery.py seed/celery_app.pyseed/celery.py renamed to seed/celery_app.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """
 SEED Platform (TM), Copyright (c) Alliance for Energy Innovation, LLC, and other contributors.
 See also https://github.com/SEED-platform/seed/blob/main/LICENSE.md
@@ -15,6 +14,3 @@
 app = celery.Celery("seed")
 app.config_from_object("django.conf:settings", namespace="CELERY")
 app.autodiscover_tasks(lambda: (*settings.SEED_CORE_APPS, "seed.analysis_pipelines"))
-
-if __name__ == "__main__":
-    app.start()

seed/tests/test_salesforce_views.py

@@ -8,11 +8,12 @@
 from unittest.mock import Mock, patch
 
 import pytest
+from django.conf import settings
 from django.db import IntegrityError, transaction
+from django.test.testcases import SerializeMixin
 from django.urls import reverse
 from django.utils.timezone import get_current_timezone
 
-from config.settings.test import SF_DOMAIN, SF_INSTANCE, SF_PASSWORD, SF_SECURITY_TOKEN, SF_USERNAME
 from seed.landing.models import SEEDUser as User
 from seed.lib.superperms.orgs.models import ROLE_MEMBER
 from seed.models import Column, PropertyView, SalesforceConfig, SalesforceMapping
@@ -32,7 +33,12 @@
 from seed.views.v3.label_inventories import LabelInventoryViewSet
 
 
-class SalesforceViewTests(DataMappingBaseTestCase):
+class SalesforceLiveTestsMixin(SerializeMixin):
+    # These tests use the same live Salesforce sandbox records and must not run in parallel.
+    lockfile = __file__
+
+
+class SalesforceViewTests(SalesforceLiveTestsMixin, DataMappingBaseTestCase):
     def setUp(self):
         user_details = {"username": "test_user@demo.com", "password": "test_pass", "email": "test_user@demo.com"}
         self.api_view = LabelInventoryViewSet()
@@ -190,8 +196,8 @@ def test_salesforce_connection_fails(self):
         self.org.save()
 
         payload_data = {"salesforce_config": {"instance": None, "username": None, "password": None, "security_token": None}}
-        if SF_DOMAIN == "test":
-            payload_data["salesforce_config"]["domain"] = SF_DOMAIN
+        if settings.SF_DOMAIN == "test":
+            payload_data["salesforce_config"]["domain"] = settings.SF_DOMAIN
 
         response = self.client.post(
             reverse("api:v3:salesforce_configs-salesforce-connection") + "?organization_id=" + str(self.org.id),
@@ -212,15 +218,15 @@ def test_salesforce_connection_success(self):
 
         payload_data = {
             "salesforce_config": {
-                "instance": SF_INSTANCE,
-                "username": SF_USERNAME,
-                "password": SF_PASSWORD,
-                "security_token": SF_SECURITY_TOKEN,
+                "instance": settings.SF_INSTANCE,
+                "username": settings.SF_USERNAME,
+                "password": settings.SF_PASSWORD,
+                "security_token": settings.SF_SECURITY_TOKEN,
             }
         }
 
-        if SF_DOMAIN == "test":
-            payload_data["salesforce_config"]["domain"] = SF_DOMAIN
+        if settings.SF_DOMAIN == "test":
+            payload_data["salesforce_config"]["domain"] = settings.SF_DOMAIN
 
         response = self.client.post(
             reverse("api:v3:salesforce_configs-salesforce-connection") + "?organization_id=" + str(self.org.id),
@@ -250,12 +256,12 @@ def test_pushing_salesforce_benchmark(self):
         # print(f" view data: {pdata}")
 
         # enable sf
-        self.sf_config.url = SF_INSTANCE
-        self.sf_config.username = SF_USERNAME
-        self.sf_config.password = encrypt(SF_PASSWORD)
-        self.sf_config.security_token = SF_SECURITY_TOKEN
-        if SF_DOMAIN == "test":
-            self.sf_config.domain = SF_DOMAIN
+        self.sf_config.url = settings.SF_INSTANCE
+        self.sf_config.username = settings.SF_USERNAME
+        self.sf_config.password = encrypt(settings.SF_PASSWORD)
+        self.sf_config.security_token = settings.SF_SECURITY_TOKEN
+        if settings.SF_DOMAIN == "test":
+            self.sf_config.domain = settings.SF_DOMAIN
         self.sf_config.save()
 
         status, _message = update_salesforce_property(self.org.id, view.id)
@@ -528,7 +534,7 @@ def test_no_sync_when_disabled(self):
     # TODO: test auto sync works and sets date
 
 
-class SalesforceViewTestPermissions(AccessLevelBaseTestCase):
+class SalesforceViewTestPermissions(SalesforceLiveTestsMixin, AccessLevelBaseTestCase):
     def setUp(self):
         super().setUp()
 
@@ -699,12 +705,12 @@ def test_property_update_salesforce_perms(self):
         self.api_view.add_labels(self.api_view.models["property"].objects.none(), "property", [view.id], [self.compliance_label.id])
 
         # enable sf
-        self.sf_config.url = SF_INSTANCE
-        self.sf_config.username = SF_USERNAME
-        self.sf_config.password = encrypt(SF_PASSWORD)
-        self.sf_config.security_token = SF_SECURITY_TOKEN
-        if SF_DOMAIN == "test":
-            self.sf_config.domain = SF_DOMAIN
+        self.sf_config.url = settings.SF_INSTANCE
+        self.sf_config.username = settings.SF_USERNAME
+        self.sf_config.password = encrypt(settings.SF_PASSWORD)
+        self.sf_config.security_token = settings.SF_SECURITY_TOKEN
+        if settings.SF_DOMAIN == "test":
+            self.sf_config.domain = settings.SF_DOMAIN
         self.sf_config.save()
 
         url = reverse("api:v3:properties-update-salesforce") + f"?organization_id={self.org.pk}"

seed/views/main.py

@@ -20,7 +20,7 @@
 from rest_framework.decorators import api_view, permission_classes
 from rest_framework.permissions import AllowAny
 
-from seed.celery import app
+from seed.celery_app import app
 from seed.decorators import ajax_request
 from seed.lib.superperms.orgs.decorators import has_perm
 from seed.utils.api import api_endpoint