Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/calendaring_jmap/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -359,11 +359,10 @@ def _event_matches_search_filters(
matches ``participant_email`` and a different participant matches
``participant_role`` still matches both conditions.

Cyrus drops a Link's ``rel: "enclosure"`` on read-back (seen against
a running instance), so ``has_attachment=True`` undercounts real
attachments there. Both Cyrus and Stalwart drop the ``attendee``
role from a participant's ``roles`` map, so
``participant_role="attendee"`` undercounts on both servers.
Stalwart drops the ``attendee`` role from a participant's ``roles``
map entirely (confirmed live: the key is absent, not ``False``), so
``participant_role="attendee"`` undercounts there; current Cyrus
keeps the role and matches correctly.
"""
if has_attachment is not None:
links = (event_data.get("links") or {}).values()
Expand Down
89 changes: 62 additions & 27 deletions src/calendaring_jmap/tests/test_jmap_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,26 @@ def _reachable(host: str, port: int) -> bool:
)


def _xfail_cyrus_in_calendar(request, server) -> None:
"""Mark the current test ``xfail`` when running against Cyrus.

Current Cyrus rejects the spec-correct singular ``inCalendar`` query
filter this client sends (see issue #91); not a client bug, so not
worked around. Any test whose only Cyrus-side failure is this calls
this instead of hardcoding an assertion against non-compliant behavior.
A class-level ``@_sync_servers`` parametrize mark can't carry a
per-param xfail for just one test in a mixed class, so this is applied
dynamically from inside the test body instead.
"""
if server == "cyrus":
request.node.add_marker(
pytest.mark.xfail(
reason="Cyrus rejects the spec-correct singular inCalendar filter, see #91",
raises=JMAPMethodError,
)
)


_DEFAULT_ICAL_START = datetime(2026, 6, 1, 10, 0, 0, tzinfo=timezone.utc)


Expand Down Expand Up @@ -176,9 +196,9 @@ def _invite_ical(
partstat: str = "NEEDS-ACTION",
) -> str:
"""``role``/``partstat`` default to REQ-PARTICIPANT/NEEDS-ACTION, mapping
to ``roles: {"attendee": true}``, confirmed live to be dropped by both
Cyrus and Stalwart. Pass ``role="CHAIR"`` for a role that survives on
both servers instead."""
to ``roles: {"attendee": true}``. Confirmed live that Stalwart drops
this role on read-back; current Cyrus keeps it. Pass ``role="CHAIR"``
for a role that survives on both servers."""
extra_lines = (
f"ORGANIZER:mailto:{organizer_email}\r\n"
f"ATTENDEE;ROLE={role};PARTSTAT={partstat};RSVP=TRUE:mailto:{attendee_email}\r\n"
Expand Down Expand Up @@ -554,6 +574,7 @@ def test_share_calendar_grants_visible_to_second_account(

def test_add_event_to_shared_calendar_targets_owner_account(
self,
request,
calendar_management_client,
second_account_client,
second_account_id,
Expand All @@ -565,6 +586,7 @@ def test_add_event_to_shared_calendar_targets_owner_account(
event under the owner's account rather than the sharee's own. This
is the fix for a gap where a calendar fetched from someone else's
account silently routed writes back to the caller's own account."""
_xfail_cyrus_in_calendar(request, server)
cal_id = calendar_management_client.create_calendar("Write Shared Integration Calendar")
try:
calendar_management_client.share_calendar(
Expand All @@ -589,6 +611,7 @@ def test_add_event_to_shared_calendar_targets_owner_account(

def test_edit_and_delete_event_on_shared_calendar_targets_owner_account(
self,
request,
calendar_management_client,
second_account_client,
second_account_id,
Expand All @@ -598,6 +621,7 @@ def test_edit_and_delete_event_on_shared_calendar_targets_owner_account(
"""save() and delete_event() must route through the calendar's owning
account too, the same way add_event() does. Both take the object's
parent._account_id, not the sharee's own session account."""
_xfail_cyrus_in_calendar(request, server)
cal_id = calendar_management_client.create_calendar("Edit Shared Integration Calendar")
try:
calendar_management_client.share_calendar(
Expand Down Expand Up @@ -902,7 +926,8 @@ def test_event_delete(self, event_client, event_calendar_id):
with pytest.raises(JMAPMethodError):
event_client.get_event(event_id)

def test_event_query_time_range(self, event_client, event_calendar_id):
def test_event_query_time_range(self, request, event_client, event_calendar_id, server):
_xfail_cyrus_in_calendar(request, server)
title = "Query Range Test Event"
event_id, _, _ = event_client.create_event(
event_calendar_id, _minimal_event(title, calendar_id=event_calendar_id)
Expand Down Expand Up @@ -1606,6 +1631,10 @@ async def test_event_delete(self, async_client, async_calendar_id):
await async_client.get_event(event_id)

@pytest.mark.asyncio
@pytest.mark.xfail(
reason="Cyrus rejects the spec-correct singular inCalendar filter, see #91",
raises=JMAPMethodError,
)
async def test_event_query_time_range(
self, async_client, async_calendar_id, async_created_event_id
):
Expand Down Expand Up @@ -2091,8 +2120,15 @@ class TestRicherEventSearchIntegration:
"""

def test_has_attachment_true_finds_event_with_attachment(
self, event_client, event_calendar_id, server
self, request, event_client, event_calendar_id, server
):
# Cyrus used to drop rel: "enclosure" on read-back, so this event
# would never match has_attachment=True there; confirmed live that
# the current pinned Cyrus image no longer has that bug, so both
# servers are expected to match now. Still xfails on Cyrus because
# search_events itself fails first on the inCalendar regression
# (#91), before has_attachment ever gets evaluated client-side.
_xfail_cyrus_in_calendar(request, server)
event_id, _, _ = event_client.create_event(
event_calendar_id, ical_to_jscal(_attachment_ical(), calendar_id=event_calendar_id)
)
Expand All @@ -2101,16 +2137,7 @@ def test_has_attachment_true_finds_event_with_attachment(
calendar_id=event_calendar_id, has_attachment=True
).events
matched = any(r.id == event_id for r in results)
if server == "cyrus":
# Cyrus drops rel: "enclosure" on read-back, seen against a
# running instance, so has_attachment=True cannot find this event there.
assert not matched, (
f"{server}: expected has_attachment=True to miss this event "
"(known rel: enclosure drop); it matched instead, meaning "
"the Cyrus bug this test documents may have been fixed."
)
else:
assert matched, f"{server}: has_attachment=True did not find the event."
assert matched, f"{server}: has_attachment=True did not find the event."
finally:
event_client.delete_event(event_id)

Expand All @@ -2131,12 +2158,13 @@ def test_has_attachment_false_excludes_event_with_attachment_on_stalwart(
event_client.delete_event(event_id)

def test_chair_participant_matches_email_status_and_role_filters(
self, event_client, event_calendar_id, owner_email, server
self, request, event_client, event_calendar_id, owner_email, server
):
"""One CHAIR/ACCEPTED participant, so a single seeded event
exercises participant_email, participation_status, and
participant_role together instead of three near-identical
create/search/delete sequences."""
_xfail_cyrus_in_calendar(request, server)
chair_email = "chair-filter-test@example.com"
event_id, _, _ = event_client.create_event(
event_calendar_id,
Expand Down Expand Up @@ -2168,12 +2196,14 @@ def test_chair_participant_matches_email_status_and_role_filters(
event_client.delete_event(event_id)

def test_participant_role_attendee_confirmed_dropped(
self, event_client, event_calendar_id, owner_email, server
self, request, event_client, event_calendar_id, owner_email, server
):
"""Locks in the confirmed-live finding that both Cyrus and Stalwart
drop the "attendee" role from a participant's roles map: this
assertion should start failing, not silently pass, the day either
server stops doing that."""
"""Locks in the confirmed-live finding that Stalwart drops the
"attendee" role from a participant's roles map: this assertion
should start failing, not silently pass, the day it stops doing
that. Current Cyrus keeps the role and matches correctly, confirmed
live, so this is Stalwart-specific, not a shared server quirk."""
_xfail_cyrus_in_calendar(request, server)
attendee_email = "attendee-role-gap-test@example.com"
event_id, _, _ = event_client.create_event(
event_calendar_id,
Expand All @@ -2183,16 +2213,20 @@ def test_participant_role_attendee_confirmed_dropped(
results = event_client.search_events(
calendar_id=event_calendar_id, participant_role="attendee"
).events
assert not any(r.id == event_id for r in results), (
f"{server}: participant_role='attendee' matched the seeded "
"participant; the confirmed-live role-drop bug this test "
"documents may have been fixed server-side."
)
matched = any(r.id == event_id for r in results)
if server == "stalwart":
assert not matched, (
f"{server}: participant_role='attendee' matched the seeded "
"participant; the confirmed-live role-drop bug this test "
"documents may have been fixed server-side."
)
else:
assert matched, f"{server}: participant_role='attendee' did not find the event."
finally:
event_client.delete_event(event_id)

def test_search_events_limit_caps_page_and_total_reflects_full_count(
self, event_client, event_calendar_id, server
self, request, event_client, event_calendar_id, server
):
"""Confirmed live this session: Cyrus includes total unconditionally
in CalendarEvent/query responses, even when calculateTotal was never
Expand All @@ -2201,6 +2235,7 @@ def test_search_events_limit_caps_page_and_total_reflects_full_count(
against a real server's response unless calculate_total=True was
actually passed, not merely whether the server happened to include
one."""
_xfail_cyrus_in_calendar(request, server)
event_ids = [
event_client.create_event(
event_calendar_id,
Expand Down
Loading