refactor(); project refactor

src/backend/apps/conflicts/tests/test_conflicts.py

@@ -15,14 +15,12 @@ from apps.conflicts.selectors import (
     experiment_conflict_domains,
 )
 from apps.conflicts.services import (
-    conflict_domain_create,
     conflict_domain_delete,
     conflict_domain_update,
     experiment_add_to_domain,
     experiment_remove_from_domain,
     experiment_update_domain_priority,
     resolve_domain_conflict,
-    validate_domain_conflicts,
 )
 from apps.conflicts.tests.helpers import make_domain
 from apps.experiments.models import ExperimentStatus
@@ -35,6 +33,7 @@ from apps.experiments.services import (
 from apps.experiments.tests.helpers import add_two_variants, make_flag
 from apps.reviews.services import review_settings_update
 from apps.reviews.tests.helpers import make_approver, make_experimenter
+from config.errors import ConflictError
 
 
 class ConflictDomainCRUDTest(TestCase):
@@ -55,7 +54,7 @@ class ConflictDomainCRUDTest(TestCase):
 
     def test_duplicate_name_fails(self) -> None:
         make_domain(suffix="_dup")
-        with self.assertRaises(Exception):
+        with self.assertRaises(ConflictError):
             make_domain(suffix="_dup")
 
     def test_updates_domain(self) -> None:
@@ -128,7 +127,7 @@ class ExperimentDomainMembershipTest(TestCase):
     def test_duplicate_membership_fails(self) -> None:
         exp = self._make_ready_experiment("_dup2")
         experiment_add_to_domain(experiment=exp, domain=self.domain)
-        with self.assertRaises(Exception):
+        with self.assertRaises(ConflictError):
             experiment_add_to_domain(experiment=exp, domain=self.domain)
 
     def test_remove_experiment_from_domain(self) -> None:
@@ -307,12 +306,8 @@ class ResolveDomainConflictTest(TestCase):
         )
         exp_low = self._make_and_start("_pr1", domain, priority=1)
         exp_high = self._make_and_start("_pr2", domain, priority=10)
-        self.assertTrue(
-            resolve_domain_conflict(exp_high.pk, domain.pk, "u1")
-        )
-        self.assertFalse(
-            resolve_domain_conflict(exp_low.pk, domain.pk, "u1")
-        )
+        self.assertTrue(resolve_domain_conflict(exp_high.pk, domain.pk, "u1"))
+        self.assertFalse(resolve_domain_conflict(exp_low.pk, domain.pk, "u1"))
 
     def test_priority_tie_first_created_wins(self) -> None:
         domain = make_domain(
@@ -322,16 +317,10 @@ class ResolveDomainConflictTest(TestCase):
         )
         exp1 = self._make_and_start("_tie1", domain, priority=5)
         exp2 = self._make_and_start("_tie2", domain, priority=5)
-        self.assertTrue(
-            resolve_domain_conflict(exp1.pk, domain.pk, "u1")
-        )
-        self.assertFalse(
-            resolve_domain_conflict(exp2.pk, domain.pk, "u1")
-        )
+        self.assertTrue(resolve_domain_conflict(exp1.pk, domain.pk, "u1"))
+        self.assertFalse(resolve_domain_conflict(exp2.pk, domain.pk, "u1"))
 
     def test_single_experiment_always_wins(self) -> None:
         domain = make_domain(suffix="_single")
         exp = self._make_and_start("_s", domain)
-        self.assertTrue(
-            resolve_domain_conflict(exp.pk, domain.pk, "u1")
-        )
+        self.assertTrue(resolve_domain_conflict(exp.pk, domain.pk, "u1"))