Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

don't test for /addressbooks/groups/ and /calendars/groups/

  • Loading branch information
m0rgen committed Apr 2, 2014
1 parent 355bdda commit b20e030cebcadbcbdfb1ac0359201df3f89f5798
@@ -28,7 +28,7 @@
<sslport2>8543</sslport2>

<authtype>basic</authtype>

<waitcount>120</waitcount>
<waitdelay>0.25</waitdelay>

@@ -37,7 +37,7 @@
<feature>COPY Method</feature> <!-- COPY method -->
<feature>MOVE Method</feature> <!-- MOVE method -->
<feature>Extended MKCOL</feature> <!-- Extended MKCOL -->

<!-- ACL related -->
<feature>ACL Method</feature> <!-- ACL method -->
<feature>acl-principal-prop-set REPORT</feature> <!-- ACL acl-principal-prop-set REPORT -->
@@ -232,10 +232,6 @@
<key>$calendars_users:</key>
<value>$calendars:$userstype:/</value>
</substitution>
<substitution>
<key>$calendars_groups:</key>
<value>$calendars:$groupstype:/</value>
</substitution>
<substitution>
<key>$calendars_resources:</key>
<value>$calendars:$resourcestype:/</value>
@@ -326,10 +322,6 @@
<key>$addressbooks_users:</key>
<value>$addressbooks:$userstype:/</value>
</substitution>
<substitution>
<key>$addressbooks_groups:</key>
<value>$addressbooks:$groupstype:/</value>
</substitution>

<!-- primary addressbook name -->
<substitution>
@@ -23,7 +23,7 @@
<nonsslport>%(nonsslport)s</nonsslport>
<sslport>%(sslport)s</sslport>
<authtype>%(authtype)s</authtype>

<waitcount>120</waitcount>
<waitdelay>0.25</waitdelay>

@@ -32,7 +32,7 @@
<feature>COPY Method</feature> <!-- COPY method -->
<feature>MOVE Method</feature> <!-- MOVE method -->
<feature>Extended MKCOL</feature> <!-- Extended MKCOL -->

<!-- ACL related -->
<feature>ACL Method</feature> <!-- ACL method -->
<feature>acl-principal-prop-set REPORT</feature> <!-- ACL acl-principal-prop-set REPORT -->
@@ -227,10 +227,6 @@
<key>$calendars_users:</key>
<value>$calendars:$userstype:/</value>
</substitution>
<substitution>
<key>$calendars_groups:</key>
<value>$calendars:$groupstype:/</value>
</substitution>
<substitution>
<key>$calendars_resources:</key>
<value>$calendars:$resourcestype:/</value>
@@ -321,10 +317,6 @@
<key>$addressbooks_users:</key>
<value>$addressbooks:$userstype:/</value>
</substitution>
<substitution>
<key>$addressbooks_groups:</key>
<value>$addressbooks:$groupstype:/</value>
</substitution>

<!-- primary addressbook name -->
<substitution>
@@ -227,10 +227,6 @@
<key>$calendars_users:</key>
<value>$calendars:$userstype:/</value>
</substitution>
<substitution>
<key>$calendars_groups:</key>
<value>$calendars:$groupstype:/</value>
</substitution>
<substitution>
<key>$calendars_resources:</key>
<value>$calendars:$resourcestype:/</value>
@@ -327,10 +323,6 @@
<key>$addressbooks_users:</key>
<value>$addressbooks:$userstype:/</value>
</substitution>
<substitution>
<key>$addressbooks_groups:</key>
<value>$addressbooks:$groupstype:/</value>
</substitution>

<!-- primary addressbook name -->
<substitution>
@@ -27,7 +27,7 @@
</require-feature>

<start/>

<test-suite name='GET on collections'>
<test name='1'>
<description>GET on root collection</description>
@@ -124,16 +124,6 @@
</request>
</test>
<test name='10'>
<description>GET on group calendars collection</description>
<request>
<method>GET</method>
<ruri>$calendars_groups:</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
</test>
<test name='11'>
<description>GET on locations calendars collection</description>
<request>
<method>GET</method>
@@ -143,7 +133,7 @@
</verify>
</request>
</test>
<test name='12'>
<test name='11'>
<description>GET on resources calendars collection</description>
<request>
<method>GET</method>
@@ -153,7 +143,7 @@
</verify>
</request>
</test>
<test name='13'>
<test name='12'>
<description>GET on __uids__ calendars collection</description>
<request>
<method>GET</method>
@@ -168,7 +158,7 @@
</request>
</test>
</test-suite>

<end/>

</caldavtest>
@@ -20,7 +20,7 @@

<caldavtest>
<description>Test GET on collections to ensure proper directory listing</description>

<require-feature>
<feature>carddav</feature>
</require-feature>
@@ -67,7 +67,7 @@
<callback>statusCode</callback>
</verify>
</request>
</test>
</test>
<test name='5'>
<description>GET on __uids__ principals collection</description>
<request>
@@ -103,16 +103,6 @@
</request>
</test>
<test name='8'>
<description>GET on group addressbooks collection</description>
<request>
<method>GET</method>
<ruri>$addressbooks_groups:</ruri>
<verify>
<callback>statusCode</callback>
</verify>
</request>
</test>
<test name='9'>
<description>GET on __uids__ addressbooks collection</description>
<request>
<method>GET</method>
@@ -129,5 +119,5 @@
</test-suite>

<end/>

</caldavtest>

0 comments on commit b20e030

Please sign in to comment.
You can’t perform that action at this time.