fixup

Author: simonLeary42

coldfront/core/allocation/tests/test_models.py

@@ -150,13 +150,11 @@ def test_status_is_active_and_start_date_equals_end_date_no_error(self):
 
 
 class AllocationAttributeModelCleanMethodTests(TestCase):
-    def _test_clean(
-        self, allocation_attribute_type_name: str, allocation_attribute_values: list, expect_validation_error: bool
-    ):
-        attribute_type = AAttributeTypeFactory(name=allocation_attribute_type_name)
+    def _test_clean(self, alloc_attr_type_name: str, alloc_attr_values: list, expect_validation_error: bool):
+        attribute_type = AAttributeTypeFactory(name=alloc_attr_type_name)
         allocation_attribute_type = AllocationAttributeTypeFactory(attribute_type=attribute_type)
         allocation_attribute = AllocationAttributeFactory(allocation_attribute_type=allocation_attribute_type)
-        for value in allocation_attribute_values:
+        for value in alloc_attr_values:
             with self.subTest(value=value):
                 if not isinstance(value, str):
                     raise TypeError("allocation attribute value must be a string")

coldfront/core/allocation/tests/test_views.py

@@ -59,13 +59,9 @@ def setUpTestData(cls):
         ProjectUserFactory(user=pi_user, project=cls.project, role=manager_role)
         cls.pi_user = pi_user
         # make a quota TB allocation attribute
-        AllocationAttributeFactory(
-            allocation=cls.allocation,
-            value=100,
-            allocation_attribute_type=AllocationAttributeTypeFactory(
-                name="Storage Quota (TB)", attribute_type=AAttributeTypeFactory(name="Int")
-            ),
-        )
+        attr_type = AAttributeTypeFactory(name="Int")
+        alloc_attr_type = AllocationAttributeTypeFactory(name="Storage Quota (TB)", attribute_type=attr_type)
+        AllocationAttributeFactory(allocation=cls.allocation, value=100, allocation_attribute_type=alloc_attr_type)
 
     def allocation_access_tstbase(self, url):
         """Test basic access control for views. For all views:

coldfront/core/project/tests/test_views.py

@@ -39,7 +39,7 @@ def setUpTestData(cls):
         cls.admin_user = UserFactory(is_staff=True, is_superuser=True)
         cls.nonproject_user = UserFactory(is_staff=False, is_superuser=False)
 
-        attributetype = PAttributeTypeFactory(name="string")
+        attributetype = PAttributeTypeFactory(name="Text")
         cls.projectattributetype = ProjectAttributeTypeFactory(attribute_type=attributetype)
 
     def project_access_tstbase(self, url):

coldfront/core/test_helpers/factories.py

@@ -317,7 +317,7 @@ class Meta:
         model = AllocationAttribute
 
     allocation_attribute_type = SubFactory(AllocationAttributeTypeFactory)
-    value = "Test attribute value"
+    value = 2048
     allocation = SubFactory(AllocationFactory)