Paginate announcement cleanup, add multi-page test, fix total count

Cleanup in conftest and _cleanup_announcements now loops until no test
announcements remain, handling the case where >7 exist across pages.

New test_multi_page_cleanup creates 9 announcements (exceeding the
server page size of 7) and verifies cleanup catches all of them.

Fix PROGRESS.md total: 411 not 412.

Author: bigcat88

PROGRESS.md

@@ -65,4 +65,4 @@
 | State | — | 2 |
 | Shares | 5 | 40 |
 | System Tags | 6 | 22 |
-| **Total** | **50** | **412** |
+| **Total** | **50** | **411** |

tests/integration/conftest.py

@@ -156,9 +156,16 @@ async def _cleanup(client: NextcloudClient) -> None:
     with contextlib.suppress(Exception):
         await client.ocs_put("apps/user_status/api/v1/user_status/status", data={"statusType": "online"})
     with contextlib.suppress(Exception):
-        announcements = await client.ocs_get("apps/announcementcenter/api/v1/announcements")
-        for ann in announcements:
-            subject = str(ann.get("subject", ""))
-            if subject.startswith("mcp-test-ann"):
-                with contextlib.suppress(Exception):
-                    await client.ocs_delete(f"apps/announcementcenter/api/v1/announcements/{ann['id']}")
+        while True:
+            announcements = await client.ocs_get("apps/announcementcenter/api/v1/announcements")
+            if not announcements:
+                break
+            deleted = False
+            for ann in announcements:
+                subject = str(ann.get("subject", ""))
+                if subject.startswith("mcp-test-ann"):
+                    with contextlib.suppress(Exception):
+                        await client.ocs_delete(f"apps/announcementcenter/api/v1/announcements/{ann['id']}")
+                    deleted = True
+            if not deleted:
+                break

tests/integration/test_announcements.py

@@ -1,5 +1,6 @@
 """Integration tests for Announcement Center tools against a real Nextcloud instance."""
 
+import contextlib
 import json
 from typing import Any
 
@@ -25,11 +26,17 @@ async def _create_announcement(nc_mcp: McpTestHelper, suffix: str = "") -> dict[
 
 
 async def _cleanup_announcements(nc_mcp: McpTestHelper) -> None:
-    """Delete all test announcements."""
-    result = await nc_mcp.call("list_announcements")
-    for a in json.loads(result)["data"]:
-        if str(a.get("subject", "")).startswith(UNIQUE):
-            await nc_mcp.call("delete_announcement", announcement_id=a["id"])
+    """Delete all test announcements, paginating through all pages."""
+    while True:
+        result = await nc_mcp.call("list_announcements")
+        data = json.loads(result)["data"]
+        deleted = False
+        for a in data:
+            if str(a.get("subject", "")).startswith(UNIQUE):
+                await nc_mcp.call("delete_announcement", announcement_id=a["id"])
+                deleted = True
+        if not deleted:
+            break
 
 
 class TestListAnnouncements:
@@ -97,6 +104,26 @@ async def test_pagination_offset(self, nc_mcp: McpTestHelper) -> None:
             await nc_mcp.call("delete_announcement", announcement_id=a1["id"])
             await nc_mcp.call("delete_announcement", announcement_id=a2["id"])
 
+    @pytest.mark.asyncio
+    async def test_multi_page_cleanup(self, nc_mcp: McpTestHelper) -> None:
+        """Create >7 announcements (server page size) and verify paginated cleanup catches all."""
+        await _cleanup_announcements(nc_mcp)
+        created_ids: list[int] = []
+        try:
+            for i in range(9):
+                ann = await _create_announcement(nc_mcp, f"bulk{i}")
+                created_ids.append(ann["id"])
+            first_page = json.loads(await nc_mcp.call("list_announcements"))
+            assert first_page["pagination"]["has_more"] is True
+            await _cleanup_announcements(nc_mcp)
+            result = await nc_mcp.call("list_announcements")
+            remaining = [a for a in json.loads(result)["data"] if str(a.get("subject", "")).startswith(UNIQUE)]
+            assert len(remaining) == 0, f"Leftover test announcements: {[a['subject'] for a in remaining]}"
+        finally:
+            for ann_id in created_ids:
+                with contextlib.suppress(Exception):
+                    await nc_mcp.call("delete_announcement", announcement_id=ann_id)
+
     @pytest.mark.asyncio
     async def test_pagination_info(self, nc_mcp: McpTestHelper) -> None:
         created = await _create_announcement(nc_mcp, "paginfo")