<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14409] CalDAVTester/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14409">14409</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-02-13 09:35:51 -0800 (Fri, 13 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Now that config.EnableConfigSyncToken is on by default, request-uri resource will be returned in some sync reports</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfoxml">CalDAVTester/trunk/scripts/server/serverinfo.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVsharingnotificationsyncxml">CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVsyncreportxml">CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVsharingsyncxml">CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVsyncreportxml">CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml</a></li>
<li><a href="#CalDAVTestertrunkverifiersmultistatusItemspy">CalDAVTester/trunk/verifiers/multistatusItems.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkscriptsserverserverinfoxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml (14408 => 14409)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2015-02-12 22:10:41 UTC (rev 14408)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2015-02-13 17:35:51 UTC (rev 14409)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> <feature>sync-report</feature> <!-- WebDAV collection sync REPORT -->
</span><span class="cx"> <!-- <feature>sync-report-limit</feature> --> <!-- WebDAV collection sync REPORT DAV:limit support -->
</span><span class="cx"> <feature>sync-report-home</feature> <!-- WebDAV collection sync REPORT on Homes -->
</span><ins>+ <feature>sync-report-config-token</feature> <!-- Sync REPORT token includes configuration component -->
</ins><span class="cx"> <feature>well-known</feature> <!-- well-known feature -->
</span><span class="cx">
</span><span class="cx"> <!-- <feature>per-object-ACLs</feature> --> <!-- ACL for objects in calendar/address books -->
</span><span class="lines">@@ -304,15 +305,21 @@
</span><span class="cx"> <!-- Sync home collection items - use "-" to include the home resource-->
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$calendar_home_items_initial_sync:</key>
</span><del>- <value>[$calendar:/,$tasks:/,$inbox:/,$outbox:/,$freebusy:,$notification:/]</value>
</del><ins>+ <value>[-,$calendar:/,$tasks:/,$inbox:/,$outbox:/,$freebusy:,$notification:/]</value>
</ins><span class="cx"> </substitution>
</span><span class="cx">
</span><span class="cx"> <!-- Sync collection extra items - use "-" to include the collection-->
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$calendar_sync_extra_items:</key>
</span><del>- <value>[]</value>
</del><ins>+ <value>[-]</value>
</ins><span class="cx"> </substitution>
</span><span class="cx">
</span><ins>+ <!-- Sync collection extra count - gets added to the totalcount value-->
+ <substitution>
+ <key>$calendar_sync_extra_count:</key>
+ <value>1</value> <!-- the request-uri resource is returned when no token passed-->
+ </substitution>
+
</ins><span class="cx"> <!-- server-to-server inbox-->
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$servertoserver:</key>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCalDAVsharingnotificationsyncxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml (14408 => 14409)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml 2015-02-12 22:10:41 UTC (rev 14408)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml 2015-02-13 17:35:51 UTC (rev 14409)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx"> </start>
</span><del>-
</del><ins>+
</ins><span class="cx"> <test-suite name='support-report-set'>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <description>On notification collection</description>
</span><span class="lines">@@ -97,6 +97,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>totalcount</name>
</span><span class="cx"> <value>0</value>
</span><ins>+ <value>$calendar_sync_extra_count:</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -123,6 +124,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>totalcount</name>
</span><span class="cx"> <value>0</value>
</span><ins>+ <value>$calendar_sync_extra_count:</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCalDAVsyncreportxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml (14408 => 14409)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml 2015-02-12 22:10:41 UTC (rev 14408)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml 2015-02-13 17:35:51 UTC (rev 14409)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx"> </start>
</span><del>-
</del><ins>+
</ins><span class="cx"> <test-suite name='support-report-set/sync-token property'>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <description>Not on calendars</description>
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><del>-
</del><ins>+
</ins><span class="cx"> <test-suite name='simple reports - sync-level'>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <require-feature>
</span><span class="lines">@@ -831,7 +831,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9'>
</del><ins>+ <test name='9'>
</ins><span class="cx"> <description>remove new resource - calendar collection depth:1</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>REPORT</method>
</span><span class="lines">@@ -2845,6 +2845,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -3507,5 +3508,5 @@
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <end/>
</span><del>-
</del><ins>+
</ins><span class="cx"> </caldavtest>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCardDAVsharingsyncxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml (14408 => 14409)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml 2015-02-12 22:10:41 UTC (rev 14408)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml 2015-02-13 17:35:51 UTC (rev 14409)
</span><span class="lines">@@ -306,6 +306,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$sharedaddressbook:/</value>
</span><span class="cx"> <value>$sharedaddressbook:/addressbook.vcf</value>
</span><span class="lines">@@ -1190,6 +1191,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userguid1:/</value>
</span><span class="cx"> <value>$userguid1:/3.vcf</value>
</span><span class="lines">@@ -1230,6 +1232,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>3.vcf</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="lines">@@ -2566,6 +2569,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userguid1:/</value>
</span><span class="cx"> <value>$userguid1:/1.vcf</value>
</span><span class="lines">@@ -2591,6 +2595,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> <value>6.vcf</value>
</span><span class="lines">@@ -2765,6 +2770,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userguid1:/</value>
</span><span class="cx"> <value>$userguid1:/1.vcf</value>
</span><span class="lines">@@ -2810,6 +2816,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> <value>4.vcf</value>
</span><span class="lines">@@ -3402,6 +3409,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userguid1:/</value>
</span><span class="cx"> <value>$userguid1:/4.vcf</value>
</span><span class="lines">@@ -3444,6 +3452,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>4.vcf</value>
</span><span class="cx"> <value>5.vcf</value>
</span><span class="cx"> <value>7.vcf</value>
</span><span class="lines">@@ -3873,6 +3882,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userguid2:/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -3899,6 +3909,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userguid2:/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -3925,6 +3936,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userguid2:/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -3951,6 +3963,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><span class="lines">@@ -3982,6 +3995,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><span class="lines">@@ -4013,6 +4027,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><span class="lines">@@ -4041,6 +4056,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -4067,6 +4083,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -4093,6 +4110,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -4119,6 +4137,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -4145,6 +4164,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -4171,6 +4191,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -4219,6 +4240,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -4245,6 +4267,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userguid2:/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -4271,6 +4294,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><span class="lines">@@ -4313,6 +4337,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> <value>3.vcf</value>
</span><span class="lines">@@ -4340,6 +4365,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userguid2:/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -4366,6 +4392,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><span class="lines">@@ -4405,6 +4432,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -4431,6 +4459,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userguid2:/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -4457,6 +4486,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><span class="lines">@@ -4499,6 +4529,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -4525,6 +4556,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userguid2:/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -4551,6 +4583,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><span class="lines">@@ -4582,6 +4615,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -4763,6 +4797,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -4805,6 +4840,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> <value>3.vcf</value>
</span><span class="lines">@@ -4844,6 +4880,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -4886,6 +4923,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -4920,6 +4958,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -5278,6 +5317,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userguid3:/</value>
</span><span class="cx"> <value>$userguid3:/1.vcf</value>
</span><span class="lines">@@ -5479,6 +5519,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userguid3:/</value>
</span><span class="cx"> <value>$userguid3:/1.vcf</value>
</span><span class="lines">@@ -6022,6 +6063,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userguid3:/</value>
</span><span class="cx"> <value>$userguid4:/</value>
</span><span class="lines">@@ -6207,6 +6249,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userguid3:/</value>
</span><span class="cx"> <value>$userguid4:/</value>
</span><span class="lines">@@ -6431,6 +6474,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userguid3:/</value>
</span><span class="cx"> <value>$userguid4:/</value>
</span><span class="lines">@@ -6621,6 +6665,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userguid3:/</value>
</span><span class="cx"> <value>$userguid3:/addressbook.vcf</value>
</span><span class="lines">@@ -6747,6 +6792,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userguid3:/</value>
</span><span class="cx"> <value>$userguid4:/</value>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCardDAVsyncreportxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml (14408 => 14409)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml 2015-02-12 22:10:41 UTC (rev 14408)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml 2015-02-13 17:35:51 UTC (rev 14409)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx"> </start>
</span><del>-
</del><ins>+
</ins><span class="cx"> <test-suite name='support-report-set'>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <description>Not on addressbooks</description>
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><del>-
</del><ins>+
</ins><span class="cx"> <test-suite name='simple reports - empty token - no props'>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <description>initial query - addressbook depth:1</description>
</span><span class="lines">@@ -193,6 +193,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -219,6 +220,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="lines">@@ -244,6 +246,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><span class="lines">@@ -282,6 +285,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> <value>3.vcf</value>
</span><span class="lines">@@ -309,6 +313,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="lines">@@ -334,6 +339,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><span class="lines">@@ -369,6 +375,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -395,6 +402,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="lines">@@ -420,6 +428,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><span class="lines">@@ -458,6 +467,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -484,6 +494,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="lines">@@ -509,6 +520,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><span class="lines">@@ -536,6 +548,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -717,6 +730,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -759,6 +773,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> <value>3.vcf</value>
</span><span class="lines">@@ -798,6 +813,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -840,6 +856,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -874,6 +891,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1116,6 +1134,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><span class="lines">@@ -1311,6 +1330,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><span class="lines">@@ -1686,5 +1706,5 @@
</span><span class="cx"> <ruri>$notificationpath2:/</ruri>
</span><span class="cx"> </request>
</span><span class="cx"> </end>
</span><del>-
</del><ins>+
</ins><span class="cx"> </caldavtest>
</span></span></pre></div>
<a id="CalDAVTestertrunkverifiersmultistatusItemspy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/verifiers/multistatusItems.py (14408 => 14409)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/verifiers/multistatusItems.py 2015-02-12 22:10:41 UTC (rev 14408)
+++ CalDAVTester/trunk/verifiers/multistatusItems.py 2015-02-13 17:35:51 UTC (rev 14409)
</span><span class="lines">@@ -128,7 +128,10 @@
</span><span class="cx"> return result, resulttxt
</span><span class="cx">
</span><span class="cx"> # Check for total count
</span><del>- if len(totalcount) == 1:
</del><ins>+ if len(totalcount) > 0:
+ # Add the 2nd value to the 1st if it exists
+ if len(totalcount) == 2:
+ totalcount[0] += totalcount[1]
</ins><span class="cx"> if len(ok_result_set) != totalcount[0]:
</span><span class="cx"> result = False
</span><span class="cx"> resulttxt += " %d items returned, but %d items expected" % (len(ok_result_set), totalcount[0],)
</span></span></pre>
</div>
</div>
</body>
</html>