diff --git a/app/project_management/tests/unit/project_milestone/test_unit_project_milestone_serializer.py b/app/project_management/tests/unit/project_milestone/test_unit_project_milestone_serializer.py index 82f1da29..dce0d12b 100644 --- a/app/project_management/tests/unit/project_milestone/test_unit_project_milestone_serializer.py +++ b/app/project_management/tests/unit/project_milestone/test_unit_project_milestone_serializer.py @@ -64,7 +64,7 @@ class ProjectMilestoneSerializerTestCases( def test_serializer_validation_no_name(self, - kwargs_api_create, model, model_serializer, request_user + kwargs_api_create, model, model_serializer, request_user, model_kwargs ): """Serializer Validation Check diff --git a/app/tests/fixtures/model_projectmilestone.py b/app/tests/fixtures/model_projectmilestone.py index 4fe77234..f5cc6558 100644 --- a/app/tests/fixtures/model_projectmilestone.py +++ b/app/tests/fixtures/model_projectmilestone.py @@ -75,9 +75,13 @@ def kwargs_projectmilestone(django_db_blocker, yield kwargs.copy() - # with django_db_blocker.unblock(): + with django_db_blocker.unblock(): + + for proj in project.projectmilestone_set.all(): + proj.delete() + + project.delete() - # project.delete() # milestone is cascade delete @pytest.fixture( scope = 'class') diff --git a/app/tests/fixtures/model_projectstate.py b/app/tests/fixtures/model_projectstate.py index 671dfe6b..a864ae90 100644 --- a/app/tests/fixtures/model_projectstate.py +++ b/app/tests/fixtures/model_projectstate.py @@ -48,10 +48,11 @@ def kwargs_projectstate(kwargs_centurionmodel, django_db_blocker, with django_db_blocker.unblock(): - try: - runbook.delete() - except models.deletion.ProtectedError: - pass + for proj in runbook.projectstate_set.all(): + proj.delete() + + runbook.delete() + @pytest.fixture( scope = 'class') diff --git a/app/tests/fixtures/model_projecttype.py b/app/tests/fixtures/model_projecttype.py index 8f130e01..3841ccaf 100644 --- a/app/tests/fixtures/model_projecttype.py +++ b/app/tests/fixtures/model_projecttype.py @@ -47,10 +47,11 @@ def kwargs_projecttype(kwargs_centurionmodel, django_db_blocker, with django_db_blocker.unblock(): - try: - runbook.delete() - except models.deletion.ProtectedError: - pass + for proj in runbook.projecttype_set.all(): + proj.delete() + + runbook.delete() + @pytest.fixture( scope = 'class')