Simplify tests

Author: JelteF

pgcommitfest/commitfest/tests/test_closure_notifications.py

@@ -255,7 +255,7 @@ def test_no_auto_move_without_email_activity(alice, in_progress_cf, open_cf):
     mail = QueuedMail.objects.first()
     body = get_email_body(mail)
     assert "Inactive Patch" in body
-    assert "need" in body  # "needs attention"
+    assert "needs attention" in body
 
 
 def test_no_auto_move_when_failing_too_long(alice, in_progress_cf, open_cf):
@@ -290,6 +290,12 @@ def test_no_auto_move_when_failing_too_long(alice, in_progress_cf, open_cf):
     patch.refresh_from_db()
     assert patch.current_commitfest().id == in_progress_cf.id
 
+    # Author should receive closure notification
+    assert QueuedMail.objects.count() == 1
+    mail = QueuedMail.objects.first()
+    body = get_email_body(mail)
+    assert "Failing Patch" in body
+
 
 def test_auto_move_when_failing_within_threshold(alice, in_progress_cf, open_cf):
     """Patches failing CI within the threshold should still be auto-moved."""
@@ -327,68 +333,22 @@ def test_auto_move_when_failing_within_threshold(alice, in_progress_cf, open_cf)
     assert QueuedMail.objects.count() == 0
 
 
-def test_no_auto_move_with_null_lastmail(alice, in_progress_cf, open_cf):
-    """Patches with no email activity (null lastmail) should NOT be auto-moved."""
-    patch = Patch.objects.create(
-        name="No Activity Patch",
-        lastmail=None,
-    )
-    patch.authors.add(alice)
-    PatchOnCommitFest.objects.create(
-        patch=patch,
-        commitfest=in_progress_cf,
-        enterdate=datetime.now(),
-        status=PatchOnCommitFest.STATUS_REVIEW,
-    )
-
-    in_progress_cf.auto_move_active_patches()
-
-    patch.refresh_from_db()
-    assert patch.current_commitfest().id == in_progress_cf.id
-
-
-def test_auto_move_patch_without_cfbot_branch(alice, in_progress_cf, open_cf):
-    """Patches with recent activity but no CI branch should be auto-moved."""
-    patch = Patch.objects.create(
-        name="No CI Patch",
-        lastmail=datetime.now() - timedelta(days=5),
-    )
-    patch.authors.add(alice)
-    PatchOnCommitFest.objects.create(
-        patch=patch,
-        commitfest=in_progress_cf,
-        enterdate=datetime.now(),
-        status=PatchOnCommitFest.STATUS_REVIEW,
-    )
-
-    # No CfbotBranch created - CI never ran
-
-    in_progress_cf.auto_move_active_patches()
-    in_progress_cf.send_closure_notifications()
-
-    patch.refresh_from_db()
-    assert patch.current_commitfest().id == open_cf.id
-
-    # No closure email for moved patches
-    assert QueuedMail.objects.count() == 0
-
-
 def test_regular_cf_does_not_move_to_draft_cf(alice, in_progress_cf):
     """Regular commitfest should move patches to the next regular CF, not a draft CF."""
-    # Create a draft CF - should be ignored for regular CF patches
+    # Create a draft CF with earlier startdate - should be ignored for regular CF patches
     draft_cf = CommitFest.objects.create(
-        name="2025-05-draft",
+        name="2024-12-draft",
         status=CommitFest.STATUS_OPEN,
-        startdate=date(2025, 5, 1),
-        enddate=date(2025, 5, 31),
+        startdate=date(2024, 12, 1),
+        enddate=date(2024, 12, 31),
         draft=True,
     )
-    # Create a regular CF - this is where patches should go
+    # Create a regular CF with later startdate - this is where patches should go
     regular_cf = CommitFest.objects.create(
-        name="2025-01",
+        name="2025-03",
         status=CommitFest.STATUS_OPEN,
-        startdate=date(2025, 1, 1),
-        enddate=date(2025, 1, 31),
+        startdate=date(2025, 3, 1),
+        enddate=date(2025, 3, 31),
         draft=False,
     )
 
@@ -422,6 +382,14 @@ def test_draft_cf_moves_active_patches_to_next_draft(alice, bob):
         enddate=date(2025, 3, 31),
         draft=True,
     )
+    # Create a regular open CF with earlier startdate - should be ignored for draft patches
+    CommitFest.objects.create(
+        name="2025-05",
+        status=CommitFest.STATUS_OPEN,
+        startdate=date(2025, 5, 1),
+        enddate=date(2025, 5, 31),
+        draft=False,
+    )
     next_draft_cf = CommitFest.objects.create(
         name="2026-03-draft",
         status=CommitFest.STATUS_OPEN,

pgcommitfest/commitfest/tests/test_refresh_commitfests.py

@@ -7,16 +7,10 @@
     CommitFest,
     Patch,
     PatchOnCommitFest,
-    Topic,
 )
 from pgcommitfest.userprofile.models import UserProfile
 
 
-@pytest.fixture
-def topic(db):
-    return Topic.objects.create(topic="General")
-
-
 @pytest.fixture
 def alice(db, django_user_model):
     user = django_user_model.objects.create_user(
@@ -41,7 +35,7 @@ def create_closed_cf(name, startdate, enddate):
 
 @pytest.mark.django_db
 @freeze_time("2024-12-05")
-def test_inprogress_cf_closes_when_enddate_passed(topic, alice):
+def test_inprogress_cf_closes_when_enddate_passed(alice):
     """When an in_progress CF's enddate has passed, it should be closed."""
     # Create some closed CFs for padding (relevant_commitfests needs history)
     create_closed_cf("2024-07", date(2024, 7, 1), date(2024, 7, 31))
@@ -73,7 +67,6 @@ def test_inprogress_cf_closes_when_enddate_passed(topic, alice):
     # Create a patch with recent activity that should be auto-moved
     patch = Patch.objects.create(
         name="Test Patch",
-        topic=topic,
         lastmail=datetime(2024, 11, 25),
     )
     patch.authors.add(alice)
@@ -133,7 +126,7 @@ def test_open_cf_becomes_inprogress_when_startdate_reached():
 
 @pytest.mark.django_db
 @freeze_time("2025-02-05")
-def test_open_cf_closes_when_enddate_passed(topic, alice):
+def test_open_cf_closes_when_enddate_passed(alice):
     """When an open CF's enddate has passed (skipping in_progress), it closes."""
     # Create some closed CFs for padding
     create_closed_cf("2024-07", date(2024, 7, 1), date(2024, 7, 31))
@@ -158,7 +151,6 @@ def test_open_cf_closes_when_enddate_passed(topic, alice):
     # Create a patch with recent activity
     patch = Patch.objects.create(
         name="Test Patch",
-        topic=topic,
         lastmail=datetime(2025, 1, 25),
     )
     patch.authors.add(alice)
@@ -214,7 +206,7 @@ def test_draft_cf_created_when_missing():
 
 @pytest.mark.django_db
 @freeze_time("2025-04-05")
-def test_draft_cf_closes_when_enddate_passed(topic, alice):
+def test_draft_cf_closes_when_enddate_passed(alice):
     """When a draft CF's enddate has passed, it should be closed."""
     # Create closed CFs for padding
     create_closed_cf("2024-07", date(2024, 7, 1), date(2024, 7, 31))
@@ -241,7 +233,6 @@ def test_draft_cf_closes_when_enddate_passed(topic, alice):
     # Create a patch with recent activity
     patch = Patch.objects.create(
         name="Draft Patch",
-        topic=topic,
         lastmail=datetime(2025, 3, 25),
     )
     patch.authors.add(alice)