From 9dc52a5e25c7f37bf76eea96b683c86129bde94b Mon Sep 17 00:00:00 2001 From: Andrew Ruthven Date: Sun, 21 Jan 2024 18:43:21 +1300 Subject: [PATCH] Updates to other tests as side effects of adding room1 and room2 principals --- .../0861-Spec-REPORT-principal.result | 28 +++++++++++++++++-- .../0902-PUT-collection.result | 2 +- .../tests/regression-suite/0924-MOVE.result | 4 +-- .../regression-suite/0950-MKTICKET.result | 2 +- .../regression-suite/0951-MKTICKET.result | 2 +- .../2600-PUT-collection.result | 2 +- 6 files changed, 32 insertions(+), 8 deletions(-) diff --git a/testing/tests/regression-suite/0861-Spec-REPORT-principal.result b/testing/tests/regression-suite/0861-Spec-REPORT-principal.result index 9925b717..b3bcaccd 100644 --- a/testing/tests/regression-suite/0861-Spec-REPORT-principal.result +++ b/testing/tests/regression-suite/0861-Spec-REPORT-principal.result @@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy -ETag: "135496e5aa8c45c3ba999c28f7ffec62" -Content-Length: 4037 +ETag: "c908bba3e1f7988318cda1bb46d3d7d7" +Content-Length: 4579 Content-Type: text/xml; charset="utf-8" @@ -176,4 +176,28 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK + + /caldav.php/room1/ + + + + /caldav.php/room1/ + + Room 1 + + HTTP/1.1 200 OK + + + + /caldav.php/room2/ + + + + /caldav.php/room2/ + + Room 2 + + HTTP/1.1 200 OK + + diff --git a/testing/tests/regression-suite/0902-PUT-collection.result b/testing/tests/regression-suite/0902-PUT-collection.result index 2b313fba..14de0d62 100644 --- a/testing/tests/regression-suite/0902-PUT-collection.result +++ b/testing/tests/regression-suite/0902-PUT-collection.result @@ -14,7 +14,7 @@ Content-Type: text/plain; charset="utf-8" attendees: >40< - collection_id: >1566< + collection_id: >1568< dav_displayname: >anotherone< dav_etag: >f9a8ee6b41d9b02aa5176e6da349121a< dav_name: >/user1/anotherone/< diff --git a/testing/tests/regression-suite/0924-MOVE.result b/testing/tests/regression-suite/0924-MOVE.result index 8f6d577a..35ba7742 100644 --- a/testing/tests/regression-suite/0924-MOVE.result +++ b/testing/tests/regression-suite/0924-MOVE.result @@ -6,9 +6,9 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - cd_collection: >1566< + cd_collection: >1568< cd_user_no: >10< - ci_collection: >1566< + ci_collection: >1568< ci_user_no: >10< data_name: >/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< item_name: >/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< diff --git a/testing/tests/regression-suite/0950-MKTICKET.result b/testing/tests/regression-suite/0950-MKTICKET.result index 6741ba27..7e776c72 100644 --- a/testing/tests/regression-suite/0950-MKTICKET.result +++ b/testing/tests/regression-suite/0950-MKTICKET.result @@ -39,6 +39,6 @@ target_resource_i: >NULL< dav_owner_id: >1002< privileges: >000000000001001011100111< target_collection: >160< -target_resource_i: >1530< +target_resource_i: >1532< timeout: >1 day< diff --git a/testing/tests/regression-suite/0951-MKTICKET.result b/testing/tests/regression-suite/0951-MKTICKET.result index 3b5c4fba..d429d28b 100644 --- a/testing/tests/regression-suite/0951-MKTICKET.result +++ b/testing/tests/regression-suite/0951-MKTICKET.result @@ -19,6 +19,6 @@ target_resource_i: >NULL< dav_owner_id: >1002< privileges: >000000000001001011100111< target_collection: >160< -target_resource_i: >1530< +target_resource_i: >1532< timeout: >24:00:00< diff --git a/testing/tests/regression-suite/2600-PUT-collection.result b/testing/tests/regression-suite/2600-PUT-collection.result index a8ee9d97..e8edeb0e 100644 --- a/testing/tests/regression-suite/2600-PUT-collection.result +++ b/testing/tests/regression-suite/2600-PUT-collection.result @@ -14,7 +14,7 @@ Content-Type: text/plain; charset="utf-8" attendees: >0< - collection_id: >1617< + collection_id: >1619< dav_displayname: >291-test-fb-rr-changes< dav_etag: >c21098570619a44e7d30283d0a703a4b< dav_name: >/user1/291-test-fb-rr-changes/<