slurm: fix tests

Signed-off-by: Cecilia Lau <[email protected]>

Author: cecilialau6776

coldfront/plugins/slurm/associations.py

@@ -25,8 +25,6 @@
     parse_qos,
 )
 
-SLURM_ACCOUNT_ATTRIBUTE_TYPE = AllocationAttributeType.objects.get(name=SLURM_ACCOUNT_ATTRIBUTE_NAME)
-
 logger = logging.getLogger(__name__)
 
 
@@ -260,13 +258,16 @@ def add_allocation(self, allocation: Allocation, res_allocations: QuerySet[Alloc
             try:
                 child_allocation = res_allocations.get(
                     pk=AllocationAttribute.objects.get(
-                        allocation_attribute_type=SLURM_ACCOUNT_ATTRIBUTE_TYPE, value=account_name
+                        allocation_attribute_type=AllocationAttributeType.objects.get(
+                            name=SLURM_ACCOUNT_ATTRIBUTE_NAME
+                        ),
+                        value=account_name,
                     ).allocation.pk
                 )
                 account.add_allocation(child_allocation, res_allocations, user_specs=user_specs)
             except ObjectDoesNotExist:
                 raise SlurmError(
-                    f"No allocation with {SLURM_ACCOUNT_ATTRIBUTE_TYPE}={account_name} in correct resource"  # Don't have an easy way to get the resource here
+                    f"No allocation with {SLURM_ACCOUNT_ATTRIBUTE_NAME}={account_name} in correct resource"  # Don't have an easy way to get the resource here
                 )
 
             self.add_account(account)

coldfront/plugins/slurm/tests/test_associations.py renamed to coldfront/plugins/slurm/tests/_test_associations.py

@@ -7,10 +7,11 @@
 from django.core.management import call_command
 from django.test import TestCase
 
-from coldfront.core.allocation.models import Allocation, AllocationAttributeType
+from coldfront.core.allocation.models import Allocation
 from coldfront.core.resource.models import ResourceAttribute, ResourceAttributeType, ResourceType
 from coldfront.core.test_helpers.factories import (
     AllocationAttributeFactory,
+    AllocationAttributeTypeFactory,
     AllocationStatusChoiceFactory,
     AllocationUserFactory,
     ProjectFactory,
@@ -22,6 +23,7 @@
 
 # Building this account structure in slurm/coldfront
 # 'a' represents an account and 'u' represents a user
+# unless otherwise stated
 #
 #      a1               a7
 #     /  \            /  | \
@@ -37,8 +39,6 @@
 class AssociationTest(TestCase):
     @classmethod
     def setUpClass(cls):
-        # call_command("import_field_of_science_data")
-        # call_command("add_default_grant_options")
         call_command("add_default_project_choices")
         call_command("add_allocation_defaults")
         call_command("add_resource_defaults")
@@ -67,8 +67,8 @@ def setUpTestData(cls):
         ProjectUserFactory(project=cls.project, user=cls.u4)
         # create allocations
         alloc_kwargs = {"project": cls.project, "status": AllocationStatusChoiceFactory(name="Active")}
-        san_aat = AllocationAttributeType.objects.get(name="slurm_account_name")
-        sc_aat = AllocationAttributeType.objects.get(name="slurm_children")
+        san_aat = AllocationAttributeTypeFactory(name="slurm_account_name")
+        sc_aat = AllocationAttributeTypeFactory(name="slurm_children")
         cls.a1 = Allocation.objects.create(**alloc_kwargs)
         cls.a2 = Allocation.objects.create(**alloc_kwargs)
         cls.a3 = Allocation.objects.create(**alloc_kwargs)