diff --git a/testing/tests/regression-suite/241-Moz-REPORT.result b/testing/tests/regression-suite/241-Moz-REPORT.result index 271da7da..96cf8c5f 100644 --- a/testing/tests/regression-suite/241-Moz-REPORT.result +++ b/testing/tests/regression-suite/241-Moz-REPORT.result @@ -7,3 +7,8 @@ Content-Type: text/xml; charset="utf-8" + + dav_displayname: >User 1 Inbox< + dav_name: >/user1/.in/< + parent_container: >/user1/< + diff --git a/testing/tests/regression-suite/241-Moz-REPORT.test b/testing/tests/regression-suite/241-Moz-REPORT.test index ebb93811..27b58c0c 100644 --- a/testing/tests/regression-suite/241-Moz-REPORT.test +++ b/testing/tests/regression-suite/241-Moz-REPORT.test @@ -25,3 +25,9 @@ BEGINDATA ENDDATA + +QUERY +SELECT dav_name, dav_displayname, parent_container + FROM collection + WHERE dav_name = '/user1/.in/' +ENDQUERY diff --git a/testing/tests/regression-suite/945-ACL.test b/testing/tests/regression-suite/945-ACL.test index 9315d59a..afc4dd11 100644 --- a/testing/tests/regression-suite/945-ACL.test +++ b/testing/tests/regression-suite/945-ACL.test @@ -52,5 +52,6 @@ SELECT by_principal, by_collection, privileges, p_to.displayname, to_principal LEFT JOIN collection ON (by_collection=collection.collection_id) LEFT JOIN dav_principal p_by ON (by_principal=p_by.principal_id) WHERE p_by.username = 'user1' + ORDER BY by_principal, to_principal ENDQUERY diff --git a/testing/tests/regression-suite/947-ACL.test b/testing/tests/regression-suite/947-ACL.test index b37933d0..a9ff0227 100644 --- a/testing/tests/regression-suite/947-ACL.test +++ b/testing/tests/regression-suite/947-ACL.test @@ -38,5 +38,6 @@ SELECT by_principal, by_collection, privileges, p_to.displayname, to_principal LEFT JOIN collection ON (by_collection=collection.collection_id) LEFT JOIN dav_principal p_by ON (by_principal=p_by.principal_id) WHERE p_by.dav_name = '/user1/' + ORDER BY by_principal, to_principal ENDQUERY diff --git a/testing/tests/regression-suite/986-PUT-bound-succeed.result b/testing/tests/regression-suite/986-PUT-bound-succeed.result index e11d5ab6..fdf7ea0f 100644 --- a/testing/tests/regression-suite/986-PUT-bound-succeed.result +++ b/testing/tests/regression-suite/986-PUT-bound-succeed.result @@ -6,13 +6,13 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - dav_etag: >9a8d7696ee2e0a0f1f4170fe4f094a3a< - dav_name: >/user2/home/thiswillworkfine.ics< - dtstart: >2010-03-22 18:00:00+13< - summary: >Test adding an event to a bound collection< - dav_etag: >1c7895f11787e71fd6dbe3260d72d4a0< dav_name: >/user2/home/thiswillalsobegood.ics< dtstart: >2004-01-01 12:00:00+13< summary: >Release DAViCal 0.9.9< + dav_etag: >9a8d7696ee2e0a0f1f4170fe4f094a3a< + dav_name: >/user2/home/thiswillworkfine.ics< + dtstart: >2010-03-22 18:00:00+13< + summary: >Test adding an event to a bound collection< + diff --git a/testing/tests/regression-suite/986-PUT-bound-succeed.test b/testing/tests/regression-suite/986-PUT-bound-succeed.test index 32262776..825b68c0 100644 --- a/testing/tests/regression-suite/986-PUT-bound-succeed.test +++ b/testing/tests/regression-suite/986-PUT-bound-succeed.test @@ -49,6 +49,7 @@ QUERY SELECT caldav_data.dav_name, caldav_data.dav_etag, dtstart, summary FROM caldav_data JOIN calendar_item USING(dav_name) WHERE caldav_data.dav_name ~ '/user2/.*thiswill' + ORDER BY dav_etag ENDQUERY