[CalendarServer-changes] [13165] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Fri Apr 4 12:38:27 PDT 2014


Revision: 13165
          http://trac.calendarserver.org//changeset/13165
Author:   sagen at apple.com
Date:     2014-04-04 12:38:27 -0700 (Fri, 04 Apr 2014)
Log Message:
-----------
landing move2who-cdt branch to trunk

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/16.xml
    CalDAVTester/trunk/scripts/server/serverinfo-pod.xml
    CalDAVTester/trunk/scripts/server/serverinfo-template.xml
    CalDAVTester/trunk/scripts/server/serverinfo.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/directory.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/directory.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml
    CalDAVTester/trunk/setup.py

Property Changed:
----------------
    CalDAVTester/trunk/
    CalDAVTester/trunk/Resource/CardDAV/
    CalDAVTester/trunk/scripts/tests/CardDAV/


Property changes on: CalDAVTester/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev:7584
/CalDAVTester/branches/release/CalDAVTester-4.3-dev:10193
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148:3149-3163
/CalDAVTester/branches/users/cdaboo/component-set-fixes:8221-8346
/CalDAVTester/branches/users/cdaboo/conditional-4466:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574:3575-3581
/CalDAVTester/branches/users/cdaboo/managed-attachments:9986-10145
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228:5229-5440
/CalDAVTester/branches/users/gaya/sharedgroupstester-3:11181-11204
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev:7584
/CalDAVTester/branches/release/CalDAVTester-4.3-dev:10193
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148:3149-3163
/CalDAVTester/branches/users/cdaboo/component-set-fixes:8221-8346
/CalDAVTester/branches/users/cdaboo/conditional-4466:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574:3575-3581
/CalDAVTester/branches/users/cdaboo/managed-attachments:9986-10145
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228:5229-5440
/CalDAVTester/branches/users/gaya/sharedgroupstester-3:11181-11204
/CalendarServer/branches/users/sagen/move2who-cdt:13094-13164


Property changes on: CalDAVTester/trunk/Resource/CardDAV
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CardDAV:7584
/CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CardDAV:10193
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/CardDAV:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/CardDAV:3149-3163
/CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CardDAV:8221-8346
/CalDAVTester/branches/users/cdaboo/conditional-4466/Resource/CardDAV:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/CardDAV:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/CardDAV:3575-3581
/CalDAVTester/branches/users/cdaboo/managed-attachments/Resource/CardDAV:9986-10145
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/CardDAV:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CardDAV:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CardDAV:5229-5440
/CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV:11078-11181
/CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV:11181-11204
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CardDAV:7584
/CalDAVTester/branches/release/CalDAVTester-4.3-dev/Resource/CardDAV:10193
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/Resource/CardDAV:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/Resource/CardDAV:3149-3163
/CalDAVTester/branches/users/cdaboo/component-set-fixes/Resource/CardDAV:8221-8346
/CalDAVTester/branches/users/cdaboo/conditional-4466/Resource/CardDAV:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/Resource/CardDAV:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/Resource/CardDAV:3575-3581
/CalDAVTester/branches/users/cdaboo/managed-attachments/Resource/CardDAV:9986-10145
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/Resource/CardDAV:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/Resource/CardDAV:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/Resource/CardDAV:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CardDAV:5229-5440
/CalDAVTester/branches/users/gaya/sharedgroupstester-2/Resource/CardDAV:11078-11181
/CalDAVTester/branches/users/gaya/sharedgroupstester-3/Resource/CardDAV:11181-11204
/CalendarServer/branches/users/sagen/move2who-cdt/Resource/CardDAV:13094-13164

Modified: CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/16.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/16.xml	2014-04-04 19:36:18 UTC (rev 13164)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/16.xml	2014-04-04 19:38:27 UTC (rev 13165)
@@ -13,7 +13,7 @@
        <C:prop-filter name="X-ADDRESSBOOKSERVER-MEMBER">
          <C:text-match collation="i;unicode-casemap"
                        match-type="contains"
-         >group</C:text-match>
+         >$groupguid3:</C:text-match>
        </C:prop-filter>
      </C:filter>
    </C:addressbook-query>

Modified: CalDAVTester/trunk/scripts/server/serverinfo-pod.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-pod.xml	2014-04-04 19:36:18 UTC (rev 13164)
+++ CalDAVTester/trunk/scripts/server/serverinfo-pod.xml	2014-04-04 19:38:27 UTC (rev 13165)
@@ -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 -->
@@ -233,10 +233,6 @@
 			<value>$calendars:$userstype:/</value>
 		</substitution>
 		<substitution>
-			<key>$calendars_groups:</key>
-			<value>$calendars:$groupstype:/</value>
-		</substitution>
-		<substitution>
 			<key>$calendars_resources:</key>
 			<value>$calendars:$resourcestype:/</value>
 		</substitution>
@@ -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>

Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2014-04-04 19:36:18 UTC (rev 13164)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2014-04-04 19:38:27 UTC (rev 13165)
@@ -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 -->
@@ -228,10 +228,6 @@
 			<value>$calendars:$userstype:/</value>
 		</substitution>
 		<substitution>
-			<key>$calendars_groups:</key>
-			<value>$calendars:$groupstype:/</value>
-		</substitution>
-		<substitution>
 			<key>$calendars_resources:</key>
 			<value>$calendars:$resourcestype:/</value>
 		</substitution>
@@ -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>

Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml	2014-04-04 19:36:18 UTC (rev 13164)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml	2014-04-04 19:38:27 UTC (rev 13165)
@@ -23,7 +23,7 @@
 	<nonsslport>8008</nonsslport>
 	<sslport>8443</sslport>
 	<authtype>basic</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 -->
@@ -109,7 +109,7 @@
 		<feature>carddav</feature> 						<!-- Basic CardDAV feature enabler -->
 		<feature>default-addressbook</feature> 			<!-- Default address book behavior -->
 		<feature>shared-addressbooks</feature>			<!-- Shared address books extension -->
-		<!-- <feature>directory-gateway</feature> -->	<!-- Directory gateway extension -->
+		<feature>directory-gateway</feature>			<!-- Directory gateway extension -->
 
 	</features>
 
@@ -228,10 +228,6 @@
 			<value>$calendars:$userstype:/</value>
 		</substitution>
 		<substitution>
-			<key>$calendars_groups:</key>
-			<value>$calendars:$groupstype:/</value>
-		</substitution>
-		<substitution>
 			<key>$calendars_resources:</key>
 			<value>$calendars:$resourcestype:/</value>
 		</substitution>
@@ -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>
@@ -358,7 +350,7 @@
 		<!-- guid for admin user -->
 		<substitution>
 			<key>$useradminguid:</key>
-			<value>admin</value>
+			<value>0C8BDE62-E600-4696-83D3-8B5ECABDFD2E</value>
 		</substitution>
 		<!-- password for admin user -->
 		<substitution>
@@ -384,7 +376,7 @@
 		<!-- guid for apprentice user -->
 		<substitution>
 			<key>$userapprenticeguid:</key>
-			<value>apprentice</value>
+			<value>29B6C503-11DF-43EC-8CCA-40C7003149CE</value>
 		</substitution>
 		<!-- password for admin user -->
 		<substitution>
@@ -423,7 +415,7 @@
 			<!-- user guid -->
 			<substitution>
 				<key>$userguid%d:</key>
-				<value>user%02d</value>
+				<value>10000000-0000-0000-0000-000000000%03d</value>
 			</substitution>
 			<!-- user name -->
 			<substitution>
@@ -563,7 +555,7 @@
 			<!-- user guid -->
 			<substitution>
 				<key>$publicuserguid%d:</key>
-				<value>public%02d</value>
+				<value>50000000-0000-0000-0000-0000000000%02d</value>
 			</substitution>
 			<!-- user name -->
 			<substitution>
@@ -622,7 +614,7 @@
 			<!-- resource guid-->
 			<substitution>
 				<key>$resourceguid%d:</key>
-				<value>resource%02d</value>
+				<value>40000000-0000-0000-0000-000000000%03d</value>
 			</substitution>
 			<!-- resource name-->
 			<substitution>
@@ -677,7 +669,7 @@
 			<!-- location guid-->
 			<substitution>
 				<key>$locationguid%d:</key>
-				<value>location%02d</value>
+				<value>30000000-0000-0000-0000-000000000%03d</value>
 			</substitution>
 			<!-- location name-->
 			<substitution>
@@ -733,7 +725,7 @@
 			<!-- group guid-->
 			<substitution>
 				<key>$groupguid%d:</key>
-				<value>group%02d</value>
+				<value>20000000-0000-0000-0000-000000000%03d</value>
 			</substitution>
 			<!-- group name-->
 			<substitution>
@@ -767,7 +759,7 @@
 		<!-- group guid-->
 		<substitution>
 			<key>$i18nguid:</key>
-			<value>i18nuser</value>
+			<value>860B3EE9-6D7C-4296-9639-E6B998074A78</value>
 		</substitution>
 		<!-- group name-->
 		<substitution>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/directory.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/directory.xml	2014-04-04 19:36:18 UTC (rev 13164)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/directory.xml	2014-04-04 19:38:27 UTC (rev 13165)
@@ -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>


Property changes on: CalDAVTester/trunk/scripts/tests/CardDAV
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CardDAV:7584
/CalDAVTester/branches/release/CalDAVTester-4.3-dev/scripts/tests/CardDAV:10193
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/scripts/tests/CardDAV:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/scripts/tests/CardDAV:3149-3163
/CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CardDAV:8221-8346
/CalDAVTester/branches/users/cdaboo/conditional-4466/scripts/tests/CardDAV:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/scripts/tests/CardDAV:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/scripts/tests/CardDAV:3575-3581
/CalDAVTester/branches/users/cdaboo/managed-attachments/scripts/tests/CardDAV:9986-10145
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/scripts/tests/CardDAV:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CardDAV:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/scripts/tests/CardDAV:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CardDAV:5229-5440
/CalDAVTester/branches/users/gaya/sharedgroupstester-2/scripts/tests/CardDAV:11078-11181
/CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV:11181-11204
   + /CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CardDAV:7584
/CalDAVTester/branches/release/CalDAVTester-4.3-dev/scripts/tests/CardDAV:10193
/CalDAVTester/branches/users/cdaboo/attendee-comments-2887/scripts/tests/CardDAV:2888-2910
/CalDAVTester/branches/users/cdaboo/better-proxy-3148/scripts/tests/CardDAV:3149-3163
/CalDAVTester/branches/users/cdaboo/component-set-fixes/scripts/tests/CardDAV:8221-8346
/CalDAVTester/branches/users/cdaboo/conditional-4466/scripts/tests/CardDAV:4467-4469
/CalDAVTester/branches/users/cdaboo/implicitauto-2948/scripts/tests/CardDAV:2949-2989
/CalDAVTester/branches/users/cdaboo/location-partial-accept-3574/scripts/tests/CardDAV:3575-3581
/CalDAVTester/branches/users/cdaboo/managed-attachments/scripts/tests/CardDAV:9986-10145
/CalDAVTester/branches/users/cdaboo/normalize-cuaddr-3533/scripts/tests/CardDAV:3534-3558
/CalDAVTester/branches/users/cdaboo/pycalendar/scripts/tests/CardDAV:7160-7206
/CalDAVTester/branches/users/cdaboo/pycard/scripts/tests/CardDAV:7226-7237
/CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CardDAV:5229-5440
/CalDAVTester/branches/users/gaya/sharedgroupstester-2/scripts/tests/CardDAV:11078-11181
/CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV:11181-11204
/CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CardDAV:13094-13164

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/directory.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/directory.xml	2014-04-04 19:36:18 UTC (rev 13164)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/directory.xml	2014-04-04 19:38:27 UTC (rev 13165)
@@ -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>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml	2014-04-04 19:36:18 UTC (rev 13164)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml	2014-04-04 19:38:27 UTC (rev 13165)
@@ -1326,16 +1326,28 @@
 						<value>$groupguid4:.vcf</value>
 						<value>$groupguid5:.vcf</value>
 						<value>$groupguid6:.vcf</value>
+						<value>$groupguid7:.vcf</value>
+						<value>$groupguid8:.vcf</value>
+						<value>$groupguid9:.vcf</value>
+						<value>$groupguid10:.vcf</value>
+						<value>$groupguid20:.vcf</value>
+						<value>$groupguid30:.vcf</value>
+						<value>$groupguid40:.vcf</value>
+						<value>$groupguid50:.vcf</value>
+						<value>$groupguid60:.vcf</value>
+						<value>$groupguid70:.vcf</value>
+						<value>$groupguid80:.vcf</value>
+						<value>$groupguid90:.vcf</value>
 					</arg>
 					<arg>
 						<name>totalcount</name>
-						<value>7</value>
+						<value>19</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
 		<test name="16" ignore="no">
-			<description>query for resources with (KIND equal "group") and (X-ADDRESSBOOKSERVER-MEMBER contains "group"), no eTag, no props " </description>
+			<description>query for resources with (KIND equal "group") and (X-ADDRESSBOOKSERVER-MEMBER contains $groupguid3:), no eTag, no props " </description>
 			<request print-response="no">
 				<method>REPORT</method>
 				<ruri>$directory:</ruri>
@@ -1348,11 +1360,10 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$groupguid4:.vcf</value>
-						<value>$groupguid5:.vcf</value>
 					</arg>
 					<arg>
 						<name>totalcount</name>
-						<value>2</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml	2014-04-04 19:36:18 UTC (rev 13164)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml	2014-04-04 19:38:27 UTC (rev 13165)
@@ -36,7 +36,7 @@
 			<ruri>$notificationpath2:/</ruri>
 		</request>
 	</start>
-	
+
 	<!-- test suite below is similar to test suite in ../CalDAV/sharing-sync.xml -->
 	<test-suite name='shared addressbook'>
 		<test name='1a'>
@@ -2231,7 +2231,7 @@
 			</request>
 		</test>
 	</test-suite>
-	
+
 	<!-- test suite below is similar to test suite in ../CalDAV/sharing-sync.xml -->
 	<test-suite name='two shared groups'>
 		<test name='0'>
@@ -3584,9 +3584,9 @@
 		</test>
 	</test-suite>
 
-	<!-- test suites below are similar to those in ../CalDAV/sync-report.xml but 
+	<!-- test suites below are similar to those in ../CalDAV/sync-report.xml but
 			use shared address books instead of calendars -->
-	
+
 	<test-suite name='support-report-set/sync-token property'>
 		<test name='0'>
 			<description>clean up old data</description>
@@ -3598,7 +3598,7 @@
 				<ruri>$addressbookhome4:/</ruri>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-	
+
 			<!-- add 2 vcards to user1 address book -->
 			<request>
 				<method>PUT</method>
@@ -3616,7 +3616,7 @@
 					<filepath>Resource/CardDAV/vreports/put/2.vcf</filepath>
 				</data>
 			</request>
-			
+
 			<!-- share user2 address book with user1 -->
 			<!-- user2 POSTs invitation -->
 			<request user="$userid2:" pswd="$pswd2:" print-response="no">
@@ -3803,7 +3803,7 @@
 			<description>On shared addressbook</description>
 			<request>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/$userid2:/</ruri>
+				<ruri>$addressbookhome1:/$userguid2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
@@ -3845,7 +3845,7 @@
 			</request>
 		</test>
 	</test-suite>
-	
+
 	<test-suite name='simple reports - sync-level'>
 		<test name='1'>
 			<require-feature>
@@ -3868,7 +3868,7 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>$userid2:/</value>
+						<value>$userguid2:/</value>
 					</arg>
 				</verify>
 			</request>
@@ -3894,7 +3894,7 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>$userid2:/</value>
+						<value>$userguid2:/</value>
 					</arg>
 				</verify>
 			</request>
@@ -3920,7 +3920,7 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>$userid2:/</value>
+						<value>$userguid2:/</value>
 					</arg>
 				</verify>
 			</request>
@@ -3948,10 +3948,10 @@
 						<value>$addressbook:/</value>
 						<value>$addressbook:/1.vcf</value>
 						<value>$addressbook:/2.vcf</value>
-						<value>$userid2:/</value>
-						<value>$userid2:/1.vcf</value>
-						<value>$userid2:/2.vcf</value>
-						<value>$userid2:/addressbook.vcf</value>
+						<value>$userguid2:/</value>
+						<value>$userguid2:/1.vcf</value>
+						<value>$userguid2:/2.vcf</value>
+						<value>$userguid2:/addressbook.vcf</value>
 					</arg>
 				</verify>
 			</request>
@@ -3979,10 +3979,10 @@
 						<value>$addressbook:/</value>
 						<value>$addressbook:/1.vcf</value>
 						<value>$addressbook:/2.vcf</value>
-						<value>$userid2:/</value>
-						<value>$userid2:/1.vcf</value>
-						<value>$userid2:/2.vcf</value>
-						<value>$userid2:/addressbook.vcf</value>
+						<value>$userguid2:/</value>
+						<value>$userguid2:/1.vcf</value>
+						<value>$userguid2:/2.vcf</value>
+						<value>$userguid2:/addressbook.vcf</value>
 					</arg>
 				</verify>
 			</request>
@@ -4010,10 +4010,10 @@
 						<value>$addressbook:/</value>
 						<value>$addressbook:/1.vcf</value>
 						<value>$addressbook:/2.vcf</value>
-						<value>$userid2:/</value>
-						<value>$userid2:/1.vcf</value>
-						<value>$userid2:/2.vcf</value>
-						<value>$userid2:/addressbook.vcf</value>
+						<value>$userguid2:/</value>
+						<value>$userguid2:/1.vcf</value>
+						<value>$userguid2:/2.vcf</value>
+						<value>$userguid2:/addressbook.vcf</value>
 					</arg>
 				</verify>
 			</request>
@@ -4240,7 +4240,7 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>$userid2:/</value>
+						<value>$userguid2:/</value>
 					</arg>
 				</verify>
 			</request>
@@ -4268,10 +4268,10 @@
 						<value>$addressbook:/</value>
 						<value>$addressbook:/1.vcf</value>
 						<value>$addressbook:/2.vcf</value>
-						<value>$userid2:/</value>
-						<value>$userid2:/1.vcf</value>
-						<value>$userid2:/2.vcf</value>
-						<value>$userid2:/addressbook.vcf</value>
+						<value>$userguid2:/</value>
+						<value>$userguid2:/1.vcf</value>
+						<value>$userguid2:/2.vcf</value>
+						<value>$userguid2:/addressbook.vcf</value>
 					</arg>
 				</verify>
 			</request>
@@ -4335,7 +4335,7 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>$userid2:/</value>
+						<value>$userguid2:/</value>
 					</arg>
 				</verify>
 			</request>
@@ -4364,10 +4364,10 @@
 						<value>$addressbook:/1.vcf</value>
 						<value>$addressbook:/2.vcf</value>
 						<value>$addressbook:/3.vcf</value>
-						<value>$userid2:/</value>
-						<value>$userid2:/1.vcf</value>
-						<value>$userid2:/2.vcf</value>
-						<value>$userid2:/addressbook.vcf</value>
+						<value>$userguid2:/</value>
+						<value>$userguid2:/1.vcf</value>
+						<value>$userguid2:/2.vcf</value>
+						<value>$userguid2:/addressbook.vcf</value>
 					</arg>
 				</verify>
 			</request>
@@ -4426,7 +4426,7 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>$userid2:/</value>
+						<value>$userguid2:/</value>
 					</arg>
 				</verify>
 			</request>
@@ -4454,10 +4454,10 @@
 						<value>$addressbook:/</value>
 						<value>$addressbook:/1.vcf</value>
 						<value>$addressbook:/2.vcf</value>
-						<value>$userid2:/</value>
-						<value>$userid2:/1.vcf</value>
-						<value>$userid2:/2.vcf</value>
-						<value>$userid2:/addressbook.vcf</value>
+						<value>$userguid2:/</value>
+						<value>$userguid2:/1.vcf</value>
+						<value>$userguid2:/2.vcf</value>
+						<value>$userguid2:/addressbook.vcf</value>
 					</arg>
 				</verify>
 			</request>
@@ -4520,7 +4520,7 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>$userid2:/</value>
+						<value>$userguid2:/</value>
 					</arg>
 				</verify>
 			</request>
@@ -4548,10 +4548,10 @@
 						<value>$addressbook:/</value>
 						<value>$addressbook:/1.vcf</value>
 						<value>$addressbook:/2.vcf</value>
-						<value>$userid2:/</value>
-						<value>$userid2:/1.vcf</value>
-						<value>$userid2:/2.vcf</value>
-						<value>$userid2:/addressbook.vcf</value>
+						<value>$userguid2:/</value>
+						<value>$userguid2:/1.vcf</value>
+						<value>$userguid2:/2.vcf</value>
+						<value>$userguid2:/addressbook.vcf</value>
 					</arg>
 				</verify>
 			</request>
@@ -5197,7 +5197,7 @@
 					<filepath>Resource/CardDAV/vreports/put/6.vcf</filepath>
 				</data>
 			</request>
-	
+
 			<!-- share user4 address book with user1 -->
 			<!-- user4 POSTs invitation -->
 			<request user="$userid4:" pswd="$pswd4:" print-response="no">
@@ -5273,14 +5273,14 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>$userid3:/</value>
-						<value>$userid3:/1.vcf</value>
-						<value>$userid3:/2.vcf</value>
-						<value>$userid3:/addressbook.vcf</value>
-						<value>$userid4:/</value>
-						<value>$userid4:/1.vcf</value>
-						<value>$userid4:/2.vcf</value>
-						<value>$userid4:/addressbook.vcf</value>
+						<value>$userguid3:/</value>
+						<value>$userguid3:/1.vcf</value>
+						<value>$userguid3:/2.vcf</value>
+						<value>$userguid3:/addressbook.vcf</value>
+						<value>$userguid4:/</value>
+						<value>$userguid4:/1.vcf</value>
+						<value>$userguid4:/2.vcf</value>
+						<value>$userguid4:/addressbook.vcf</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -5293,7 +5293,7 @@
 			<description>new resource</description>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/$userid3:/3.vcf</ruri>
+				<ruri>$addressbookhome1:/$userguid3:/3.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/9.vcf</filepath>
@@ -5317,8 +5317,8 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid3:/</value>
-						<value>$userid3:/3.vcf</value>
+						<value>$userguid3:/</value>
+						<value>$userguid3:/3.vcf</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -5331,7 +5331,7 @@
 			<description>remove resource (treated as new)</description>
 			<request>
 				<method>DELETE</method>
-				<ruri>$addressbookhome1:/$userid3:/3.vcf</ruri>
+				<ruri>$addressbookhome1:/$userguid3:/3.vcf</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
@@ -5351,11 +5351,11 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid3:/</value>
+						<value>$userguid3:/</value>
 					</arg>
 					<arg>
 						<name>badhrefs</name>
-						<value>$userid3:/3.vcf</value>
+						<value>$userguid3:/3.vcf</value>
 					</arg>
 				</verify>
 			</request>
@@ -5377,11 +5377,11 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid3:/</value>
+						<value>$userguid3:/</value>
 					</arg>
 					<arg>
 						<name>badhrefs</name>
-						<value>$userid3:/3.vcf</value>
+						<value>$userguid3:/3.vcf</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -5394,7 +5394,7 @@
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/$userid3:/1.vcf</ruri>
+				<ruri>$addressbookhome1:/$userguid3:/1.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/5.vcf</filepath>
@@ -5418,8 +5418,8 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid3:/</value>
-						<value>$userid3:/1.vcf</value>
+						<value>$userguid3:/</value>
+						<value>$userguid3:/1.vcf</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -5474,14 +5474,14 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>$userid3:/</value>
-						<value>$userid3:/1.vcf</value>
-						<value>$userid3:/2.vcf</value>
-						<value>$userid3:/addressbook.vcf</value>
-						<value>$userid4:/</value>
-						<value>$userid4:/1.vcf</value>
-						<value>$userid4:/2.vcf</value>
-						<value>$userid4:/addressbook.vcf</value>
+						<value>$userguid3:/</value>
+						<value>$userguid3:/1.vcf</value>
+						<value>$userguid3:/2.vcf</value>
+						<value>$userguid3:/addressbook.vcf</value>
+						<value>$userguid4:/</value>
+						<value>$userguid4:/1.vcf</value>
+						<value>$userguid4:/2.vcf</value>
+						<value>$userguid4:/addressbook.vcf</value>
 					</arg>
 				</verify>
 				<verify>
@@ -5502,7 +5502,7 @@
 			<description>new resource</description>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/$userid4:/3.vcf</ruri>
+				<ruri>$addressbookhome1:/$userguid4:/3.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/12.vcf</filepath>
@@ -5526,8 +5526,8 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid4:/</value>
-						<value>$userid4:/3.vcf</value>
+						<value>$userguid4:/</value>
+						<value>$userguid4:/3.vcf</value>
 					</arg>
 				</verify>
 				<verify>
@@ -5548,7 +5548,7 @@
 			<description>remove resource (treated as new)</description>
 			<request>
 				<method>DELETE</method>
-				<ruri>$addressbookhome1:/$userid4:/3.vcf</ruri>
+				<ruri>$addressbookhome1:/$userguid4:/3.vcf</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
@@ -5568,11 +5568,11 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid4:/</value>
+						<value>$userguid4:/</value>
 					</arg>
 					<arg>
 						<name>badhrefs</name>
-						<value>$userid4:/3.vcf</value>
+						<value>$userguid4:/3.vcf</value>
 					</arg>
 				</verify>
 			</request>
@@ -5594,11 +5594,11 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid4:/</value>
+						<value>$userguid4:/</value>
 					</arg>
 					<arg>
 						<name>badhrefs</name>
-						<value>$userid4:/3.vcf</value>
+						<value>$userguid4:/3.vcf</value>
 					</arg>
 				</verify>
 				<verify>
@@ -5618,7 +5618,7 @@
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/$userid4:/1.vcf</ruri>
+				<ruri>$addressbookhome1:/$userguid4:/1.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/7.vcf</filepath>
@@ -5642,8 +5642,8 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid4:/</value>
-						<value>$userid4:/1.vcf</value>
+						<value>$userguid4:/</value>
+						<value>$userguid4:/1.vcf</value>
 					</arg>
 				</verify>
 				<verify>
@@ -5714,12 +5714,12 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>$userid3:/</value>
-						<value>$userid3:/1.vcf</value>
-						<value>$userid3:/2.vcf</value>
-						<value>$userid4:/</value>
-						<value>$userid4:/1.vcf</value>
-						<value>$userid4:/2.vcf</value>
+						<value>$userguid3:/</value>
+						<value>$userguid3:/1.vcf</value>
+						<value>$userguid3:/2.vcf</value>
+						<value>$userguid4:/</value>
+						<value>$userguid4:/1.vcf</value>
+						<value>$userguid4:/2.vcf</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -5773,7 +5773,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>badhrefs</name>
-						<value>$userid3:/</value>
+						<value>$userguid3:/</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -5837,7 +5837,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid3:/</value>
+						<value>$userguid3:/</value>
 					</arg>
 				</verify>
 			</request>
@@ -5859,7 +5859,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid3:/</value>
+						<value>$userguid3:/</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -5869,7 +5869,7 @@
 			</request>
 		</test>
 	</test-suite>
-	
+
 	<test-suite name='simple reports - diff token - no props - home depth:1'>
 		<require-feature>
 			<feature>sync-report-home</feature>
@@ -5941,7 +5941,7 @@
 					<filepath>Resource/CardDAV/vreports/put/6.vcf</filepath>
 				</data>
 			</request>
-	
+
 			<!-- share user4 address book with user1 -->
 			<!-- user4 POSTs invitation -->
 			<request user="$userid4:" pswd="$pswd4:" print-response="no">
@@ -6017,8 +6017,8 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>$userid3:/</value>
-						<value>$userid4:/</value>
+						<value>$userguid3:/</value>
+						<value>$userguid4:/</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -6031,7 +6031,7 @@
 			<description>new resource</description>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/$userid3:/3.vcf</ruri>
+				<ruri>$addressbookhome1:/$userguid3:/3.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/9.vcf</filepath>
@@ -6055,7 +6055,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid3:/</value>
+						<value>$userguid3:/</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -6068,7 +6068,7 @@
 			<description>remove resource (treated as new)</description>
 			<request>
 				<method>DELETE</method>
-				<ruri>$addressbookhome1:/$userid3:/3.vcf</ruri>
+				<ruri>$addressbookhome1:/$userguid3:/3.vcf</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
@@ -6088,7 +6088,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid3:/</value>
+						<value>$userguid3:/</value>
 					</arg>
 				</verify>
 			</request>
@@ -6110,7 +6110,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid3:/</value>
+						<value>$userguid3:/</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -6123,7 +6123,7 @@
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/$userid3:/1.vcf</ruri>
+				<ruri>$addressbookhome1:/$userguid3:/1.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/5.vcf</filepath>
@@ -6147,7 +6147,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid3:/</value>
+						<value>$userguid3:/</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -6202,8 +6202,8 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>$userid3:/</value>
-						<value>$userid4:/</value>
+						<value>$userguid3:/</value>
+						<value>$userguid4:/</value>
 					</arg>
 				</verify>
 				<verify>
@@ -6224,7 +6224,7 @@
 			<description>new resource</description>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/$userid4:/3.vcf</ruri>
+				<ruri>$addressbookhome1:/$userguid4:/3.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/10.vcf</filepath>
@@ -6248,7 +6248,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid4:/</value>
+						<value>$userguid4:/</value>
 					</arg>
 				</verify>
 				<verify>
@@ -6269,7 +6269,7 @@
 			<description>remove resource (treated as new)</description>
 			<request>
 				<method>DELETE</method>
-				<ruri>$addressbookhome1:/$userid4:/3.vcf</ruri>
+				<ruri>$addressbookhome1:/$userguid4:/3.vcf</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
@@ -6289,7 +6289,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid4:/</value>
+						<value>$userguid4:/</value>
 					</arg>
 				</verify>
 			</request>
@@ -6311,7 +6311,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid4:/</value>
+						<value>$userguid4:/</value>
 					</arg>
 				</verify>
 				<verify>
@@ -6331,7 +6331,7 @@
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/$userid4:/1.vcf</ruri>
+				<ruri>$addressbookhome1:/$userguid4:/1.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/put/7.vcf</filepath>
@@ -6355,7 +6355,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid4:/</value>
+						<value>$userguid4:/</value>
 					</arg>
 				</verify>
 				<verify>
@@ -6426,8 +6426,8 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>$userid3:/</value>
-						<value>$userid4:/</value>
+						<value>$userguid3:/</value>
+						<value>$userguid4:/</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -6440,21 +6440,21 @@
 			<description>remove resource then addressbook</description>
 			<request>
 				<method>DELETE</method>
-				<ruri>$addressbookhome1:/$userid3:/1.vcf</ruri>
+				<ruri>$addressbookhome1:/$userguid3:/1.vcf</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 			<request>
 				<method>DELETE</method>
-				<ruri>$addressbookhome1:/$userid3:/2.vcf</ruri>
+				<ruri>$addressbookhome1:/$userguid3:/2.vcf</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 			<request>
 				<method>DELETE</method>
-				<ruri>$addressbookhome1:/$userid3:/</ruri>
+				<ruri>$addressbookhome1:/$userguid3:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
@@ -6474,7 +6474,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>badhrefs</name>
-						<value>$userid3:/</value>
+						<value>$userguid3:/</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -6540,7 +6540,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid3:/</value>
+						<value>$userguid3:/</value>
 					</arg>
 				</verify>
 			</request>
@@ -6562,7 +6562,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid3:/</value>
+						<value>$userguid3:/</value>
 					</arg>
 				</verify>
 			</request>
@@ -6616,12 +6616,12 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>$userid3:/</value>
-						<value>$userid3:/addressbook.vcf</value>
-						<value>$userid4:/</value>
-						<value>$userid4:/1.vcf</value>
-						<value>$userid4:/2.vcf</value>
-						<value>$userid4:/addressbook.vcf</value>
+						<value>$userguid3:/</value>
+						<value>$userguid3:/addressbook.vcf</value>
+						<value>$userguid4:/</value>
+						<value>$userguid4:/1.vcf</value>
+						<value>$userguid4:/2.vcf</value>
+						<value>$userguid4:/addressbook.vcf</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -6634,7 +6634,7 @@
 			<description>Change a property</description>
 			<request>
 				<method>PROPPATCH</method>
-				<ruri>$addressbookhome1:/$userid3:/</ruri>
+				<ruri>$addressbookhome1:/$userguid3:/</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/37.xml</filepath>
@@ -6658,7 +6658,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid3:/</value>
+						<value>$userguid3:/</value>
 					</arg>
 				</verify>
 				<verify>
@@ -6678,7 +6678,7 @@
 			<description>Remove a property</description>
 			<request>
 				<method>PROPPATCH</method>
-				<ruri>$addressbookhome1:/$userid3:/</ruri>
+				<ruri>$addressbookhome1:/$userguid3:/</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/38.xml</filepath>
@@ -6702,7 +6702,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid3:/</value>
+						<value>$userguid3:/</value>
 					</arg>
 				</verify>
 				<verify>
@@ -6742,8 +6742,8 @@
 					<arg>
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
-						<value>$userid3:/</value>
-						<value>$userid4:/</value>
+						<value>$userguid3:/</value>
+						<value>$userguid4:/</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -6756,7 +6756,7 @@
 			<description>Change a property</description>
 			<request>
 				<method>PROPPATCH</method>
-				<ruri>$addressbookhome1:/$userid3:/</ruri>
+				<ruri>$addressbookhome1:/$userguid3:/</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/37.xml</filepath>
@@ -6780,7 +6780,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid3:/</value>
+						<value>$userguid3:/</value>
 					</arg>
 				</verify>
 				<verify>
@@ -6800,7 +6800,7 @@
 			<description>Remove a property</description>
 			<request>
 				<method>PROPPATCH</method>
-				<ruri>$addressbookhome1:/$userid3:/</ruri>
+				<ruri>$addressbookhome1:/$userguid3:/</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/38.xml</filepath>
@@ -6824,7 +6824,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>okhrefs</name>
-						<value>$userid3:/</value>
+						<value>$userguid3:/</value>
 					</arg>
 				</verify>
 				<verify>
@@ -6855,5 +6855,5 @@
 			<ruri>$notificationpath4:/</ruri>
 		</request>
 	</end>
-	
+
 </caldavtest>

Modified: CalDAVTester/trunk/setup.py
===================================================================
--- CalDAVTester/trunk/setup.py	2014-04-04 19:36:18 UTC (rev 13164)
+++ CalDAVTester/trunk/setup.py	2014-04-04 19:38:27 UTC (rev 13165)
@@ -88,6 +88,7 @@
 
         break
     else:
+        full_version = base_version
         full_version += "a.unknown"
         full_version += "-r{revision}".format(revision=svn_revision)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140404/e2c51b62/attachment-0001.html>


More information about the calendarserver-changes mailing list