diff --git a/testing/tests/regression-suite/0886-REPORT-freebusy.result b/testing/tests/regression-suite/0886-REPORT-freebusy.result index 8e8c3f89..478ff51e 100644 --- a/testing/tests/regression-suite/0886-REPORT-freebusy.result +++ b/testing/tests/regression-suite/0886-REPORT-freebusy.result @@ -1,7 +1,7 @@ HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule -DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule +DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy Content-Length: 2752 Content-Type: text/calendar @@ -73,12 +73,6 @@ FREEBUSY:20070629T040000Z/20070629T054500Z END:VFREEBUSY END:VCALENDAR - Dav Name: >/user1/collection/Daily_NY_5pm.ics< - a) start: >20060101T220000Z< - b)finish: >20060101T230000Z< - rrule: >FREQ=DAILY;INTERVAL=1;COUNT=1000< - status: >NULL< - Dav Name: >/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics< a) start: >20061102T183000Z< b)finish: >20061102T203000Z< diff --git a/testing/tests/regression-suite/0886-REPORT-freebusy.test b/testing/tests/regression-suite/0886-REPORT-freebusy.test index f5b6aded..24a1c460 100644 --- a/testing/tests/regression-suite/0886-REPORT-freebusy.test +++ b/testing/tests/regression-suite/0886-REPORT-freebusy.test @@ -24,10 +24,12 @@ SELECT dav_name AS "Dav Name", calendar_item.rrule, status, to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "a) start", to_char(calendar_item.dtend at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "b)finish" FROM caldav_data INNER JOIN calendar_item USING(dav_id,user_no,dav_name) - WHERE caldav_data.user_no = 10 + WHERE + dav_name ~ '^/user1/home/[^/]+$' AND rrule_event_overlaps( dtstart, dtend, rrule, '20061001T000000', '20070630T235959') AND caldav_data.caldav_type IN ( 'VEVENT', 'VFREEBUSY' ) AND (calendar_item.status != 'CANCELLED' OR calendar_item.status IS NULL) AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL) ORDER BY 2, 3, 4 ENDQUERY +# caldav_data.user_no = 10