From e1d18a8dedf4c837b73d6950d7275bba096b191a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 18 Jan 2016 15:10:33 +0100 Subject: [PATCH 1/3] Adjust CalDAV tests --- apps/dav/tests/travis/caldav/script.sh | 5 +++-- .../data/Resource/CalDAV/current-user-principal/1.xml | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/current-user-principal/1.xml diff --git a/apps/dav/tests/travis/caldav/script.sh b/apps/dav/tests/travis/caldav/script.sh index a295c83ad9..f5db868296 100644 --- a/apps/dav/tests/travis/caldav/script.sh +++ b/apps/dav/tests/travis/caldav/script.sh @@ -9,8 +9,9 @@ sleep 30 # run the tests cd "$SCRIPTPATH/CalDAVTester" -PYTHONPATH="$SCRIPTPATH/pycalendar/src" python testcaldav.py --print-details-onfail -s "$SCRIPTPATH/../caldavtest/serverinfo.xml" -o cdt.txt \ - "$SCRIPTPATH/../caldavtest/tests/CalDAV/current-user-principal.xml" +PYTHONPATH="$SCRIPTPATH/pycalendar/src" python testcaldav.py --print-details-onfail --basedir "$SCRIPTPATH/../caldavtest/" -o cdt.txt \ + "CalDAV/current-user-principal.xml" + RESULT=$? tail "$/../../../../../data-autotest/owncloud.log" diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/current-user-principal/1.xml b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/current-user-principal/1.xml new file mode 100644 index 0000000000..77a67c110d --- /dev/null +++ b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/current-user-principal/1.xml @@ -0,0 +1,6 @@ + + + + + + From f18f1e40b755dda184899769e015d613624c293d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 18 Jan 2016 20:03:54 +0100 Subject: [PATCH 2/3] CalDAV sync tests --- apps/dav/tests/travis/caldav/script.sh | 4 +- .../data/Resource/CalDAV/reports/put/1.txt | 32 +++ .../data/Resource/CalDAV/reports/put/1.xml | 13 ++ .../data/Resource/CalDAV/reports/put/2.txt | 33 +++ .../data/Resource/CalDAV/reports/put/3.txt | 34 +++ .../data/Resource/CalDAV/reports/put/4.txt | 39 ++++ .../data/Resource/CalDAV/reports/put/5.txt | 38 ++++ .../data/Resource/CalDAV/reports/put/6.txt | 48 ++++ .../data/Resource/CalDAV/reports/sync/1.xml | 7 + .../data/Resource/CalDAV/reports/sync/10.xml | 6 + .../data/Resource/CalDAV/reports/sync/11.xml | 7 + .../data/Resource/CalDAV/reports/sync/2.xml | 5 + .../data/Resource/CalDAV/reports/sync/21.xml | 7 + .../data/Resource/CalDAV/reports/sync/3.xml | 5 + .../data/Resource/CalDAV/reports/sync/4.xml | 5 + .../data/Resource/CalDAV/reports/sync/5.xml | 8 + .../data/Resource/CalDAV/reports/sync/6.xml | 8 + .../data/Resource/CalDAV/reports/sync/7.xml | 8 + .../data/Resource/CalDAV/reports/sync/8.xml | 6 + .../tests/travis/caldavtest/serverinfo.xml | 8 +- .../caldavtest/tests/CalDAV/sync-report.xml | 213 ++---------------- 21 files changed, 331 insertions(+), 203 deletions(-) create mode 100644 apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/1.txt create mode 100644 apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/1.xml create mode 100644 apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/2.txt create mode 100644 apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/3.txt create mode 100644 apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/4.txt create mode 100644 apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/5.txt create mode 100644 apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/6.txt create mode 100644 apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/1.xml create mode 100644 apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/10.xml create mode 100644 apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/11.xml create mode 100644 apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/2.xml create mode 100644 apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/21.xml create mode 100644 apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/3.xml create mode 100644 apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/4.xml create mode 100644 apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/5.xml create mode 100644 apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/6.xml create mode 100644 apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/7.xml create mode 100644 apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/8.xml diff --git a/apps/dav/tests/travis/caldav/script.sh b/apps/dav/tests/travis/caldav/script.sh index f5db868296..0c4a7ad1c2 100644 --- a/apps/dav/tests/travis/caldav/script.sh +++ b/apps/dav/tests/travis/caldav/script.sh @@ -10,7 +10,9 @@ sleep 30 # run the tests cd "$SCRIPTPATH/CalDAVTester" PYTHONPATH="$SCRIPTPATH/pycalendar/src" python testcaldav.py --print-details-onfail --basedir "$SCRIPTPATH/../caldavtest/" -o cdt.txt \ - "CalDAV/current-user-principal.xml" + "CalDAV/sync-report.xml" + +# "CalDAV/current-user-principal.xml" \ RESULT=$? diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/1.txt b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/1.txt new file mode 100644 index 0000000000..2d0a3641ac --- /dev/null +++ b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/1.txt @@ -0,0 +1,32 @@ +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Example Inc.//Example Calendar//EN +VERSION:2.0 +BEGIN:VTIMEZONE +LAST-MODIFIED:20040110T032845Z +TZID:US/Eastern +BEGIN:DAYLIGHT +DTSTART:20000404T020000 +RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4 +TZNAME:EDT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +END:DAYLIGHT +BEGIN:STANDARD +DTSTART:20001026T020000 +RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10 +TZNAME:EST +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +END:STANDARD +END:VTIMEZONE +BEGIN:VEVENT +DTSTAMP:20051222T205953Z +CREATED:20060101T150000Z +DTSTART;TZID=US/Eastern:$now.year.1:0101T100000 +DURATION:PT1H +SUMMARY:event 1 +UID:54E181BC7CCC373042B28842@ninevah.local +CATEGORIES:cool +END:VEVENT +END:VCALENDAR diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/1.xml b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/1.xml new file mode 100644 index 0000000000..676679bdd8 --- /dev/null +++ b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/1.xml @@ -0,0 +1,13 @@ + + + + + + + + + Special Resource + + + diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/2.txt b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/2.txt new file mode 100644 index 0000000000..67de0524ec --- /dev/null +++ b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/2.txt @@ -0,0 +1,33 @@ +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Example Inc.//Example Calendar//EN +VERSION:2.0 +BEGIN:VTIMEZONE +LAST-MODIFIED:20040110T032845Z +TZID:US/Mountain +BEGIN:DAYLIGHT +DTSTART:20000404T020000 +RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4 +TZNAME:MDT +TZOFFSETFROM:-0700 +TZOFFSETTO:-0600 +END:DAYLIGHT +BEGIN:STANDARD +DTSTART:20001026T020000 +RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10 +TZNAME:MST +TZOFFSETFROM:-0600 +TZOFFSETTO:-0700 +END:STANDARD +END:VTIMEZONE +BEGIN:VEVENT +DTSTAMP:20051222T210052Z +CREATED:20060101T160000Z +DTSTART;TZID=US/Mountain:$now.year.1:0101T110000 +DURATION:PT1H +SUMMARY:event 2 +DESCRIPTION:Some notes +UID:9A6519F71822CD45840C3440@ninevah.local +CATEGORIES:cool,hot +END:VEVENT +END:VCALENDAR diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/3.txt b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/3.txt new file mode 100644 index 0000000000..bfdc0dbd11 --- /dev/null +++ b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/3.txt @@ -0,0 +1,34 @@ +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Example Inc.//Example Calendar//EN +VERSION:2.0 +BEGIN:VTIMEZONE +LAST-MODIFIED:20040110T032845Z +TZID:US/Pacific +BEGIN:DAYLIGHT +DTSTART:20000404T020000 +RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4 +TZNAME:PDT +TZOFFSETFROM:-0800 +TZOFFSETTO:-0700 +END:DAYLIGHT +BEGIN:STANDARD +DTSTART:20001026T020000 +RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10 +TZNAME:PST +TZOFFSETFROM:-0700 +TZOFFSETTO:-0800 +END:STANDARD +END:VTIMEZONE +BEGIN:VEVENT +DTSTAMP:20051222T210146Z +CREATED:20060101T210000Z +DTSTART;TZID=US/Pacific:$now.year.1:0101T130000 +DURATION:PT1H +LAST-MODIFIED:20051222T210203Z +SEQUENCE:1 +SUMMARY:event 3 +UID:DB3F97EF10A051730E2F752E@ninevah.local +CATEGORIES:hot +END:VEVENT +END:VCALENDAR diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/4.txt b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/4.txt new file mode 100644 index 0000000000..be22385464 --- /dev/null +++ b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/4.txt @@ -0,0 +1,39 @@ +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Example Inc.//Example Calendar//EN +VERSION:2.0 +BEGIN:VTIMEZONE +LAST-MODIFIED:20040110T032845Z +TZID:US/Eastern +BEGIN:DAYLIGHT +DTSTART:20000404T020000 +RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4 +TZNAME:EDT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +END:DAYLIGHT +BEGIN:STANDARD +DTSTART:20001026T020000 +RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10 +TZNAME:EST +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +END:STANDARD +END:VTIMEZONE +BEGIN:VEVENT +DTSTAMP:20051222T210310Z +CREATED:20060101T230000Z +DTSTART;TZID=US/Eastern:$now.year.1:0101T180000 +DURATION:PT1H +SUMMARY:event 4 +UID:A3217B429B4D2FF2DC2EEE66@ninevah.local +CATEGORIES:cool +CATEGORIES:hot +BEGIN:VALARM +ACTION:AUDIO +TRIGGER;RELATED=START:-PT1H +REPEAT:5 +DURATION:PT10M +END:VALARM +END:VEVENT +END:VCALENDAR diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/5.txt b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/5.txt new file mode 100644 index 0000000000..e1d701e269 --- /dev/null +++ b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/5.txt @@ -0,0 +1,38 @@ +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Example Inc.//Example Calendar//EN +VERSION:2.0 +BEGIN:VTIMEZONE +LAST-MODIFIED:20040110T032845Z +TZID:US/Eastern +BEGIN:DAYLIGHT +DTSTART:20000404T020000 +RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4 +TZNAME:EDT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +END:DAYLIGHT +BEGIN:STANDARD +DTSTART:20001026T020000 +RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10 +TZNAME:EST +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +END:STANDARD +END:VTIMEZONE +BEGIN:VEVENT +DTSTAMP:20051222T210412Z +CREATED:20060102T150000Z +DTSTART;TZID=US/Eastern:$now.year.1:0102T100000 +DURATION:PT1H +RRULE:FREQ=DAILY;COUNT=5 +SUMMARY:event 5 +UID:945113826375CBB89184DC36@ninevah.local +CATEGORIES:cool,hot +CATEGORIES:warm +BEGIN:VALARM +ACTION:AUDIO +TRIGGER;RELATED=START:-PT10M +END:VALARM +END:VEVENT +END:VCALENDAR diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/6.txt b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/6.txt new file mode 100644 index 0000000000..ecabe13a70 --- /dev/null +++ b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/6.txt @@ -0,0 +1,48 @@ +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Example Inc.//Example Calendar//EN +VERSION:2.0 +BEGIN:VTIMEZONE +LAST-MODIFIED:20040110T032845Z +TZID:US/Eastern +BEGIN:DAYLIGHT +DTSTART:20000404T020000 +RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4 +TZNAME:EDT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +END:DAYLIGHT +BEGIN:STANDARD +DTSTART:20001026T020000 +RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10 +TZNAME:EST +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +END:STANDARD +END:VTIMEZONE +BEGIN:VEVENT +DTSTAMP:20051222T210507Z +CREATED:20060102T190000Z +DTSTART;TZID=US/Eastern:$now.year.1:0102T140000 +DURATION:PT1H +RRULE:FREQ=DAILY;COUNT=5 +SUMMARY:event 6 +UID:F5B811E00073B22BA6B87551@ninevah.local +CATEGORIES:warm,hot +CATEGORIES:cool +END:VEVENT +BEGIN:VEVENT +DTSTAMP:20051222T210507Z +UID:F5B811E00073B22BA6B87551@ninevah.local +RECURRENCE-ID;TZID=US/Eastern:$now.year.1:0104T140000 +CREATED:20060102T190000Z +DTSTART;TZID=US/Eastern:$now.year.1:0104T160000 +DURATION:PT1H +SUMMARY:event 6 changed +DESCRIPTION:Some notes +BEGIN:VALARM +ACTION:AUDIO +TRIGGER;RELATED=START:-PT10M +END:VALARM +END:VEVENT +END:VCALENDAR diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/1.xml b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/1.xml new file mode 100644 index 0000000000..4c54b88fd0 --- /dev/null +++ b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/1.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/10.xml b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/10.xml new file mode 100644 index 0000000000..b20b6d645a --- /dev/null +++ b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/10.xml @@ -0,0 +1,6 @@ + + + +bogus + + diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/11.xml b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/11.xml new file mode 100644 index 0000000000..c7706328d5 --- /dev/null +++ b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/11.xml @@ -0,0 +1,7 @@ + + +null + + + + diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/2.xml b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/2.xml new file mode 100644 index 0000000000..99ee3dbb0e --- /dev/null +++ b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/2.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/21.xml b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/21.xml new file mode 100644 index 0000000000..7a851c80c9 --- /dev/null +++ b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/21.xml @@ -0,0 +1,7 @@ + + + +0 +10 + + diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/3.xml b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/3.xml new file mode 100644 index 0000000000..9cb886b813 --- /dev/null +++ b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/3.xml @@ -0,0 +1,5 @@ + + +$synctoken1: + + diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/4.xml b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/4.xml new file mode 100644 index 0000000000..e0d0baf4a7 --- /dev/null +++ b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/4.xml @@ -0,0 +1,5 @@ + + +$synctoken2: + + diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/5.xml b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/5.xml new file mode 100644 index 0000000000..4469bb434f --- /dev/null +++ b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/5.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/6.xml b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/6.xml new file mode 100644 index 0000000000..05b7198eb6 --- /dev/null +++ b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/6.xml @@ -0,0 +1,8 @@ + + +$synctoken1: + + + + + diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/7.xml b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/7.xml new file mode 100644 index 0000000000..575b2f673d --- /dev/null +++ b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/7.xml @@ -0,0 +1,8 @@ + + +$synctoken2: + + + + + diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/8.xml b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/8.xml new file mode 100644 index 0000000000..6badc4143c --- /dev/null +++ b/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/8.xml @@ -0,0 +1,6 @@ + + + +1 + + diff --git a/apps/dav/tests/travis/caldavtest/serverinfo.xml b/apps/dav/tests/travis/caldavtest/serverinfo.xml index dea8f5af0f..c3ba99ee03 100644 --- a/apps/dav/tests/travis/caldavtest/serverinfo.xml +++ b/apps/dav/tests/travis/caldavtest/serverinfo.xml @@ -64,7 +64,7 @@ resource-id sync-report - sync-report-home + sync-report-config-token well-known @@ -180,7 +180,7 @@ $principalcollection: - $root:principals/users/ + $root:principals/ @@ -482,7 +482,7 @@ $principaluri%d: - $principalcollection:$userid%d:/ + $principals_users:$userid%d:/ $principal%dnoslash: @@ -492,7 +492,7 @@ $calendarhome%d: - $calendars_uids:$userguid%d: + $calendars:$userid%d: diff --git a/apps/dav/tests/travis/caldavtest/tests/CalDAV/sync-report.xml b/apps/dav/tests/travis/caldavtest/tests/CalDAV/sync-report.xml index c675af8206..cf4fcde251 100644 --- a/apps/dav/tests/travis/caldavtest/tests/CalDAV/sync-report.xml +++ b/apps/dav/tests/travis/caldavtest/tests/CalDAV/sync-report.xml @@ -26,8 +26,12 @@ - MKCALENDAR + MKCOL $calendarhome1:/synccalendar1/ + + application/xml; charset="utf-8" + Resource/CalDAV/reports/put/1.xml + PUT @@ -46,8 +50,12 @@ - MKCALENDAR + MKCOL $calendarhome1:/synccalendar2/ + + application/xml; charset="utf-8" + Resource/CalDAV/reports/put/1.xml + PUT @@ -101,67 +109,6 @@ - - On calendar-home - - PROPFIND - $calendarhome1:/ -
- Depth - 0 -
- - text/xml; charset=utf-8 - Resource/CalDAV/reports/sync/1.xml - - - - sync-report-home - - xmlElementMatch - - exists - $verify-property-prefix:/{DAV:}supported-report-set/{DAV:}supported-report/{DAV:}report/{DAV:}sync-collection - $verify-property-prefix:/{DAV:}sync-token[+data:,] - - - - - sync-report-home - - propfindItems - - okprops - {DAV:}supported-report-set - {DAV:}sync-token - - - - - sync-report-home - - xmlElementMatch - - notexists - $verify-property-prefix:/{DAV:}supported-report-set/{DAV:}supported-report/{DAV:}report/{DAV:}sync-collection - - - - - sync-report-home - - propfindItems - - okprops - {DAV:}supported-report-set - - - badprops - {DAV:}sync-token - - - - On calendar @@ -180,7 +127,7 @@ exists $verify-property-prefix:/{DAV:}supported-report-set/{DAV:}supported-report/{DAV:}report/{DAV:}sync-collection - $verify-property-prefix:/{DAV:}sync-token[+data:,] + @@ -193,53 +140,6 @@ - - On inbox - - PROPFIND - $inboxpath1:/ -
- Depth - 0 -
- - text/xml; charset=utf-8 - Resource/CalDAV/reports/sync/1.xml - - - xmlElementMatch - - exists - $verify-property-prefix:/{DAV:}supported-report-set/{DAV:}supported-report/{DAV:}report/{DAV:}sync-collection - - - - propfindItems - - okprops - {DAV:}supported-report-set - {DAV:}sync-token - - - - - - - sync-report-home - - Look for options header tag on principal - - OPTIONS - $principal1: - - header - - header - *DAV$.*calendarserver-home-sync[^-]* - - - - @@ -458,7 +358,6 @@ multistatusItems okhrefs - $calendar_sync_extra_items: 1.ics 2.ics @@ -600,28 +499,6 @@ - - Bad sync-level - - REPORT - $calendarhome1:/synccalendar1/ -
- Depth - 0 -
- - text/xml; charset=utf-8 - Resource/CalDAV/reports/sync/10.xml - - - statusCode - - status - 400 - - - - @@ -642,7 +519,6 @@ multistatusItems okhrefs - $calendar_sync_extra_items: 1.ics 2.ics @@ -746,7 +622,6 @@ multistatusItems okhrefs - $calendar_sync_extra_items: 1.ics 2.ics 3.ics @@ -848,7 +723,6 @@ multistatusItems okhrefs - $calendar_sync_extra_items: 1.ics 2.ics @@ -952,7 +826,6 @@ multistatusItems okhrefs - $calendar_sync_extra_items: 1.ics 2.ics @@ -1045,7 +918,6 @@ multistatusItems okhrefs - $calendar_sync_extra_items: 1.ics 2.ics @@ -1227,7 +1099,6 @@ multistatusItems okhrefs - $calendar_sync_extra_items: 1.ics 2.ics @@ -1270,7 +1141,6 @@ multistatusItems okhrefs - $calendar_sync_extra_items: 1.ics 2.ics 3.ics @@ -1310,7 +1180,6 @@ multistatusItems okhrefs - $calendar_sync_extra_items: 1.ics 2.ics @@ -1353,7 +1222,6 @@ multistatusItems okhrefs - $calendar_sync_extra_items: 1.ics 2.ics @@ -1388,7 +1256,6 @@ multistatusItems okhrefs - $calendar_sync_extra_items: 1.ics 2.ics @@ -2827,31 +2694,6 @@ - - - initial query - - REPORT - $inboxpath1:/ -
- Depth - 1 -
- - text/xml; charset=utf-8 - Resource/CalDAV/reports/sync/2.xml - - - multistatusItems - - okhrefs - $calendar_sync_extra_items: - - - - - - initial query @@ -2872,6 +2714,10 @@ error {DAV:}valid-sync-token + + ignoreextras + {http://sabredav.org/ns}message + @@ -3478,35 +3324,6 @@ - - - - - sync-report-limit - - Limit not allowed - - REPORT - $calendarhome1:/ -
- Depth - 0 -
- - text/xml; charset=utf-8 - Resource/CalDAV/reports/sync/21.xml - - - prepostcondition - - error - {DAV:}number-of-matches-within-limits - - - - - - From c1d8d60754284b11fcaa50b6e1d325bb050de4c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Tue, 19 Jan 2016 15:33:57 +0100 Subject: [PATCH 3/3] Add back the current-user-principal test suite --- apps/dav/tests/travis/caldav/script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dav/tests/travis/caldav/script.sh b/apps/dav/tests/travis/caldav/script.sh index 0c4a7ad1c2..fe3391d5a0 100644 --- a/apps/dav/tests/travis/caldav/script.sh +++ b/apps/dav/tests/travis/caldav/script.sh @@ -10,9 +10,9 @@ sleep 30 # run the tests cd "$SCRIPTPATH/CalDAVTester" PYTHONPATH="$SCRIPTPATH/pycalendar/src" python testcaldav.py --print-details-onfail --basedir "$SCRIPTPATH/../caldavtest/" -o cdt.txt \ + "CalDAV/current-user-principal.xml" \ "CalDAV/sync-report.xml" -# "CalDAV/current-user-principal.xml" \ RESULT=$?