Skip to content

Commit bb15c01

Browse files
tobixenclaude
andcommitted
Cleanup/merging mess
Forry for doing a force push on the main branch! I was doing development on one branch `more_checks` for a while, but managed to mess up locally by chcking out the main branch while investigating some regressions. And then Claude was basically reimplementing the work I had already done on the brnach `more_checks`, shame on me for not paying better attention. I've tasked Claude to clean up the mess. I probably did a force-push a bit too early as this work hasn't been reviewed yet. Claude has tried to merge main into more_checks and then combining the best of both branches. From main (22 commits): - save-load.journal and save-load.get-by-url checks in PrepareCalendar - CheckIsNotDefined with search.is-not-defined.category and .dtend sub-features - Fine-tuned time-range checks (recent vs old dates) in CheckSearch - post_filter=False everywhere for accurate server-side testing - CheckCaseSensitiveSearch and CheckSubstringSearch - Bedework compat fixes, stale year-2000 object cleanup - Raw DELETE for delete-calendar, skip case-insensitive when no filtering - test_ai_checks_with_mocks.py test suite From more_checks (unique contributions): - CheckDuplicateUID (cross-calendar duplicate UID detection, Zimbra handling) - CheckSyncToken (RFC6578 sync token support) - CheckFreeBusyQuery (RFC4791 freebusy query) - CheckTimezone (non-UTC timezone event support, GitHub #372) Conflict resolution improvements: - save-load.get-by-url now uses permanent csc_simple_event1 instead of a temporary event - avoids create/delete cycle per the design principle - CheckIsNotDefined now uses permanent csc_event_with_class and csc_event_with_duration events instead of temporary objects - csc_event_with_class and csc_event_with_duration added to PrepareCalendar - Updated test mocks to match permanent-event approach - Fixed test_ai_filters test that documented the now-fixed date(1980) bug Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2 parents 4ade0e5 + 25137d9 commit bb15c01

5 files changed

Lines changed: 1480 additions & 412 deletions

File tree

src/caldav_server_tester/checker.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ def cleanup(self, force=True):
7070
self.calendar.delete()
7171
if self.tasklist != self.calendar:
7272
self.tasklist.delete()
73+
if self.journallist != self.calendar:
74+
self.journallist.delete()
7375
else:
7476
for uid in (
7577
"csc_simple_task1",
@@ -78,19 +80,27 @@ def cleanup(self, force=True):
7880
"csc_simple_event3",
7981
"csc_simple_event4",
8082
"csc_event_with_categories",
83+
"csc_event_with_class",
84+
"csc_event_with_duration",
8185
"csc_simple_task2",
8286
"csc_simple_task3",
87+
"csc_simple_journal1",
8388
"csc_monthly_recurring_event",
8489
"csc_monthly_recurring_task",
85-
"csc_monthly_recurring_with_exception"):
90+
"csc_monthly_recurring_with_exception",
91+
"csc_recurring_count_task",
92+
"csc_url_check"):
8693
try:
8794
self.calendar.object_by_uid(uid).delete()
8895
except:
8996
try:
9097
self.tasklist.object_by_uid(uid).delete()
9198
except:
92-
## TODO: investigate
93-
pass
99+
try:
100+
self.journallist.object_by_uid(uid).delete()
101+
except:
102+
## TODO: investigate
103+
pass
94104

95105
def report(self, verbose=False, return_what=str):
96106
ret = {

0 commit comments

Comments
 (0)