<!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>[11827] CalendarServer/branches/users/gaya/sharedgroupfixes/txdav</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/11827">11827</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2013-10-18 13:54:58 -0700 (Fri, 18 Oct 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>raise SyncTokenValidException when nonzero revision is < bind revision; fix tests</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTesterbranchesusersgayasharedgroupfixestesterscriptstestsCalDAVsharingnotificationsyncxml">CalDAVTester/branches/users/gaya/sharedgroupfixestester/scripts/tests/CalDAV/sharing-notification-sync.xml</a></li>
<li><a href="#CalDAVTesterbranchesusersgayasharedgroupfixestesterscriptstestsCalDAVsharingsyncxml">CalDAVTester/branches/users/gaya/sharedgroupfixestester/scripts/tests/CalDAV/sharing-sync.xml</a></li>
<li><a href="#CalendarServerbranchesusersgayasharedgroupfixestxdavcaldavdatastoretesttest_sqlpy">CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/caldav/datastore/test/test_sql.py</a></li>
<li><a href="#CalendarServerbranchesusersgayasharedgroupfixestxdavcarddavdatastoresqlpy">CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/carddav/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesusersgayasharedgroupfixestxdavcommondatastoresqlpy">CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/common/datastore/sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTesterbranchesusersgayasharedgroupfixestesterscriptstestsCalDAVsharingnotificationsyncxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/branches/users/gaya/sharedgroupfixestester/scripts/tests/CalDAV/sharing-notification-sync.xml (11826 => 11827)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/users/gaya/sharedgroupfixestester/scripts/tests/CalDAV/sharing-notification-sync.xml        2013-10-18 19:38:34 UTC (rev 11826)
+++ CalDAVTester/branches/users/gaya/sharedgroupfixestester/scripts/tests/CalDAV/sharing-notification-sync.xml        2013-10-18 20:54:58 UTC (rev 11827)
</span><span class="lines">@@ -466,8 +466,34 @@
</span><span class="cx">                                         <name>{DAV:}href</name>
</span><span class="cx">                                         <variable>$sharedcalendar:</variable>
</span><span class="cx">                                 </grabelement>
</span><ins>+                                <grabelement>
+                                        <name>{DAV:}href</name>
+                                        <variable>basename($sharedcalendarbasename:)</variable>
+                                </grabelement>
</ins><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><ins>+                <test name='6-' ignore='no'>
+                        <description>bad sync token</description>
+                        <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+                                <method>REPORT</method>
+                                <ruri>$calendarhome2:/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>infinity</value>
+                                </header>
+                                <data substitutions='yes'>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                        <arg>
+                                                <name>status</name>
+                                                <value>403</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
</ins><span class="cx">                 <test name='6' ignore='no'>
</span><span class="cx">                         <description>new calendar</description>
</span><span class="cx">                         <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</span><span class="lines">@@ -479,18 +505,46 @@
</span><span class="cx">                                 </header>
</span><span class="cx">                                 <data substitutions='yes'>
</span><span class="cx">                                         <content-type>text/xml; charset=utf-8</content-type>
</span><del>-                                        <filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
</del><ins>+                                        <filepath>Resource/CalDAV/sharing/notification-sync/2.xml</filepath>
</ins><span class="cx">                                 </data>
</span><span class="cx">                                 <verify>
</span><ins>+                                        <exclude-feature>
+                                                <feature>split-calendars</feature>
+                                        </exclude-feature>
</ins><span class="cx">                                         <callback>multistatusItems</callback>
</span><span class="cx">                                         <arg>
</span><del>-                                                <name>prefix</name>
-                                                <value/>
</del><ins>+                                                <name>okhrefs</name>
+                                                <value>$sharedcalendarbasename:/</value>
+                                                <value>$calendar:/</value>
+                                                <value>$inbox:/</value>
+                                                <value>$outbox:/</value>
+                                                <value>$freebusy:</value>
+                                                <value>$notification:/</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><ins>+                                                <name>badhrefs</name>
+                                                <value>$dropbox:/</value>
+                                        </arg>
+                                </verify>
+                                <verify>
+                                        <require-feature>
+                                                <feature>split-calendars</feature>
+                                        </require-feature>
+                                        <callback>multistatusItems</callback>
+                                        <arg>
</ins><span class="cx">                                                 <name>okhrefs</name>
</span><del>-                                                <value>$sharedcalendar:/</value>
</del><ins>+                                                <value>$sharedcalendarbasename:/</value>
+                                                <value>$calendar:/</value>
+                                                <value>$tasks:/</value>
+                                                <value>$inbox:/</value>
+                                                <value>$outbox:/</value>
+                                                <value>$freebusy:</value>
+                                                <value>$notification:/</value>
</ins><span class="cx">                                         </arg>
</span><ins>+                                        <arg>
+                                                <name>badhrefs</name>
+                                                <value>$dropbox:/</value>
+                                        </arg>
</ins><span class="cx">                                 </verify>
</span><span class="cx">                                 <grabelement>
</span><span class="cx">                                         <name>/{DAV:}multistatus/{DAV:}sync-token</name>
</span><span class="lines">@@ -662,8 +716,34 @@
</span><span class="cx">                                         <name>{DAV:}href</name>
</span><span class="cx">                                         <variable>$sharedcalendar:</variable>
</span><span class="cx">                                 </grabelement>
</span><ins>+                                <grabelement>
+                                        <name>{DAV:}href</name>
+                                        <variable>basename($sharedcalendarbasename:)</variable>
+                                </grabelement>
</ins><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><ins>+                <test name='6-' ignore='no'>
+                        <description>bad sync token</description>
+                        <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+                                <method>REPORT</method>
+                                <ruri>$calendarhome2:/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>infinity</value>
+                                </header>
+                                <data substitutions='yes'>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                        <arg>
+                                                <name>status</name>
+                                                <value>403</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
</ins><span class="cx">                 <test name='6' ignore='no'>
</span><span class="cx">                         <description>new calendar</description>
</span><span class="cx">                         <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</span><span class="lines">@@ -675,18 +755,46 @@
</span><span class="cx">                                 </header>
</span><span class="cx">                                 <data substitutions='yes'>
</span><span class="cx">                                         <content-type>text/xml; charset=utf-8</content-type>
</span><del>-                                        <filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
</del><ins>+                                        <filepath>Resource/CalDAV/sharing/notification-sync/2.xml</filepath>
</ins><span class="cx">                                 </data>
</span><span class="cx">                                 <verify>
</span><ins>+                                        <exclude-feature>
+                                                <feature>split-calendars</feature>
+                                        </exclude-feature>
</ins><span class="cx">                                         <callback>multistatusItems</callback>
</span><span class="cx">                                         <arg>
</span><del>-                                                <name>prefix</name>
-                                                <value/>
</del><ins>+                                                <name>okhrefs</name>
+                                                <value>$sharedcalendarbasename:/</value>
+                                                <value>$calendar:/</value>
+                                                <value>$inbox:/</value>
+                                                <value>$outbox:/</value>
+                                                <value>$freebusy:</value>
+                                                <value>$notification:/</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><ins>+                                                <name>badhrefs</name>
+                                                <value>$dropbox:/</value>
+                                        </arg>
+                                </verify>
+                                <verify>
+                                        <require-feature>
+                                                <feature>split-calendars</feature>
+                                        </require-feature>
+                                        <callback>multistatusItems</callback>
+                                        <arg>
</ins><span class="cx">                                                 <name>okhrefs</name>
</span><del>-                                                <value>$sharedcalendar:/</value>
</del><ins>+                                                <value>$sharedcalendarbasename:/</value>
+                                                <value>$calendar:/</value>
+                                                <value>$tasks:/</value>
+                                                <value>$inbox:/</value>
+                                                <value>$outbox:/</value>
+                                                <value>$freebusy:</value>
+                                                <value>$notification:/</value>
</ins><span class="cx">                                         </arg>
</span><ins>+                                        <arg>
+                                                <name>badhrefs</name>
+                                                <value>$dropbox:/</value>
+                                        </arg>
</ins><span class="cx">                                 </verify>
</span><span class="cx">                                 <grabelement>
</span><span class="cx">                                         <name>/{DAV:}multistatus/{DAV:}sync-token</name>
</span><span class="lines">@@ -896,8 +1004,34 @@
</span><span class="cx">                                         <name>{DAV:}href</name>
</span><span class="cx">                                         <variable>$sharedcalendar:</variable>
</span><span class="cx">                                 </grabelement>
</span><ins>+                                <grabelement>
+                                        <name>{DAV:}href</name>
+                                        <variable>basename($sharedcalendarbasename:)</variable>
+                                </grabelement>
</ins><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><ins>+                <test name='6-' ignore='no'>
+                        <description>bad sync token</description>
+                        <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+                                <method>REPORT</method>
+                                <ruri>$calendarhome2:/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>infinity</value>
+                                </header>
+                                <data substitutions='yes'>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                        <arg>
+                                                <name>status</name>
+                                                <value>403</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
</ins><span class="cx">                 <test name='6' ignore='no'>
</span><span class="cx">                         <description>new calendar</description>
</span><span class="cx">                         <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</span><span class="lines">@@ -909,19 +1043,48 @@
</span><span class="cx">                                 </header>
</span><span class="cx">                                 <data substitutions='yes'>
</span><span class="cx">                                         <content-type>text/xml; charset=utf-8</content-type>
</span><del>-                                        <filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
</del><ins>+                                        <filepath>Resource/CalDAV/sharing/notification-sync/2.xml</filepath>
</ins><span class="cx">                                 </data>
</span><span class="cx">                                 <verify>
</span><ins>+                                        <exclude-feature>
+                                                <feature>split-calendars</feature>
+                                        </exclude-feature>
</ins><span class="cx">                                         <callback>multistatusItems</callback>
</span><span class="cx">                                         <arg>
</span><del>-                                                <name>prefix</name>
-                                                <value/>
</del><ins>+                                                <name>okhrefs</name>
+                                                <value>$sharedcalendarbasename:/</value>
+                                                <value>$sharedcalendarbasename:/1.ics</value>
+                                                <value>$calendar:/</value>
+                                                <value>$inbox:/</value>
+                                                <value>$outbox:/</value>
+                                                <value>$freebusy:</value>
+                                                <value>$notification:/</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><ins>+                                                <name>badhrefs</name>
+                                                <value>$dropbox:/</value>
+                                        </arg>
+                                </verify>
+                                <verify>
+                                        <require-feature>
+                                                <feature>split-calendars</feature>
+                                        </require-feature>
+                                        <callback>multistatusItems</callback>
+                                        <arg>
</ins><span class="cx">                                                 <name>okhrefs</name>
</span><del>-                                                <value>$sharedcalendar:/</value>
-                                                <value>$sharedcalendar:/1.ics</value>
</del><ins>+                                                <value>$sharedcalendarbasename:/</value>
+                                                <value>$sharedcalendarbasename:/1.ics</value>
+                                                <value>$calendar:/</value>
+                                                <value>$tasks:/</value>
+                                                <value>$inbox:/</value>
+                                                <value>$outbox:/</value>
+                                                <value>$freebusy:</value>
+                                                <value>$notification:/</value>
</ins><span class="cx">                                         </arg>
</span><ins>+                                        <arg>
+                                                <name>badhrefs</name>
+                                                <value>$dropbox:/</value>
+                                        </arg>
</ins><span class="cx">                                 </verify>
</span><span class="cx">                                 <grabelement>
</span><span class="cx">                                         <name>/{DAV:}multistatus/{DAV:}sync-token</name>
</span></span></pre></div>
<a id="CalDAVTesterbranchesusersgayasharedgroupfixestesterscriptstestsCalDAVsharingsyncxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/branches/users/gaya/sharedgroupfixestester/scripts/tests/CalDAV/sharing-sync.xml (11826 => 11827)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/users/gaya/sharedgroupfixestester/scripts/tests/CalDAV/sharing-sync.xml        2013-10-18 19:38:34 UTC (rev 11826)
+++ CalDAVTester/branches/users/gaya/sharedgroupfixestester/scripts/tests/CalDAV/sharing-sync.xml        2013-10-18 20:54:58 UTC (rev 11827)
</span><span class="lines">@@ -292,6 +292,21 @@
</span><span class="cx">                                         <filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
</span><span class="cx">                                 </data>
</span><span class="cx">                                 <verify>
</span><ins>+                                        <callback>statusCode</callback>
+                                        <arg>
+                                                <name>status</name>
+                                                <value>403</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                        <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+                                <method>REPORT</method>
+                                <ruri>$calendarhome2:/</ruri>
+                                <data substitutions='yes'>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/REPORT/sync-init-level-infinite.xml</filepath>
+                                </data>
+                                <verify>
</ins><span class="cx">                                         <callback>multistatusItems</callback>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>ignoremissing</name>
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayasharedgroupfixestxdavcaldavdatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/caldav/datastore/test/test_sql.py (11826 => 11827)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/caldav/datastore/test/test_sql.py        2013-10-18 19:38:34 UTC (rev 11826)
+++ CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/caldav/datastore/test/test_sql.py        2013-10-18 20:54:58 UTC (rev 11827)
</span><span class="lines">@@ -1773,7 +1773,7 @@
</span><span class="cx"> otherCal = yield otherHome.childWithName(newCalName)
</span><span class="cx"> self.assertNotEqual(otherCal._bindRevision, 0)
</span><span class="cx">
</span><del>- changed, deleted = yield otherCal.resourceNamesSinceRevision(otherCal._bindRevision - 1)
</del><ins>+ changed, deleted = yield otherCal.resourceNamesSinceRevision(0)
</ins><span class="cx"> self.assertNotEqual(len(changed), 0)
</span><span class="cx"> self.assertEqual(len(deleted), 0)
</span><span class="cx">
</span><span class="lines">@@ -1782,7 +1782,7 @@
</span><span class="cx"> self.assertEqual(len(deleted), 0)
</span><span class="cx">
</span><span class="cx"> for depth in ("1", "infinity",):
</span><del>- changed, deleted = yield otherHome.resourceNamesSinceRevision(otherCal._bindRevision - 1, depth)
</del><ins>+ changed, deleted = yield otherHome.resourceNamesSinceRevision(0, depth)
</ins><span class="cx"> self.assertNotEqual(len(changed), 0)
</span><span class="cx"> self.assertEqual(len(deleted), 0)
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayasharedgroupfixestxdavcarddavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/carddav/datastore/sql.py (11826 => 11827)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/carddav/datastore/sql.py        2013-10-18 19:38:34 UTC (rev 11826)
+++ CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/carddav/datastore/sql.py        2013-10-18 20:54:58 UTC (rev 11827)
</span><span class="lines">@@ -595,10 +595,10 @@
</span><span class="cx"> bindRevisions += [groupBindRow[5] for groupBindRow in groupBindRows]
</span><span class="cx">
</span><span class="cx"> if revision != 0 and revision < max(bindRevisions):
</span><del>- if depth == '1':
</del><ins>+ if depth != '1':
+ raise SyncTokenValidException
+ else:
</ins><span class="cx"> revision = 0
</span><del>- else:
- raise SyncTokenValidException
</del><span class="cx">
</span><span class="cx"> path = self.name()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayasharedgroupfixestxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/common/datastore/sql.py (11826 => 11827)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/common/datastore/sql.py        2013-10-18 19:38:34 UTC (rev 11826)
+++ CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/common/datastore/sql.py        2013-10-18 20:54:58 UTC (rev 11827)
</span><span class="lines">@@ -67,7 +67,8 @@
</span><span class="cx"> HomeChildNameAlreadyExistsError, NoSuchHomeChildError, \
</span><span class="cx"> ObjectResourceNameNotAllowedError, ObjectResourceNameAlreadyExistsError, \
</span><span class="cx"> NoSuchObjectResourceError, AllRetriesFailed, InvalidSubscriptionValues, \
</span><del>- InvalidIMIPTokenValues, TooManyObjectResourcesError
</del><ins>+ InvalidIMIPTokenValues, TooManyObjectResourcesError, \
+ SyncTokenValidException
</ins><span class="cx"> from txdav.common.idirectoryservice import IStoreDirectoryService
</span><span class="cx"> from txdav.common.inotifications import INotificationCollection, \
</span><span class="cx"> INotificationObject
</span><span class="lines">@@ -1945,8 +1946,7 @@
</span><span class="cx">
</span><span class="cx"> # Now deal with shared collections
</span><span class="cx"> # TODO: think about whether this can be done in one query rather than looping over each share
</span><del>- shares = yield self.children()
- for share in shares:
</del><ins>+ for share in (yield self.children()):
</ins><span class="cx"> if not share.owned():
</span><span class="cx"> sharedChanged, sharedDeleted = yield share.sharedChildResourceNamesSinceRevision(revision, depth)
</span><span class="cx"> changed |= sharedChanged
</span><span class="lines">@@ -4118,8 +4118,9 @@
</span><span class="cx"> @type revision: C{int}
</span><span class="cx"> """
</span><span class="cx">
</span><del>- if revision < self._bindRevision:
- revision = 0
</del><ins>+ if revision != 0 and revision < self._bindRevision:
+ raise SyncTokenValidException
+
</ins><span class="cx"> return super(CommonHomeChild, self).resourceNamesSinceRevision(revision)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -4146,10 +4147,15 @@
</span><span class="cx"> """
</span><span class="cx"> assert not self.owned()
</span><span class="cx">
</span><ins>+ if revision != 0 and revision < self._bindRevision:
+ if depth != '1':
+ raise SyncTokenValidException
+ else:
+ revision = 0
+
</ins><span class="cx"> changed = set()
</span><span class="cx"> deleted = set()
</span><span class="cx"> rev = self._revisionsSchema
</span><del>- sharerevision = 0 if revision < self._bindRevision else revision
</del><span class="cx"> results = [
</span><span class="cx"> (
</span><span class="cx"> self.name(),
</span><span class="lines">@@ -4159,14 +4165,14 @@
</span><span class="cx"> for name, wasdeleted in
</span><span class="cx"> (yield Select([rev.RESOURCE_NAME, rev.DELETED],
</span><span class="cx"> From=rev,
</span><del>- Where=(rev.REVISION > sharerevision).And(
</del><ins>+ Where=(rev.REVISION > revision).And(
</ins><span class="cx"> rev.RESOURCE_ID == self._resourceID)).on(self._txn))
</span><span class="cx"> if name
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> for path, name, wasdeleted in results:
</span><span class="cx"> if wasdeleted:
</span><del>- if sharerevision:
</del><ins>+ if revision:
</ins><span class="cx"> if depth == "1":
</span><span class="cx"> changed.add("%s/" % (path,))
</span><span class="cx"> else:
</span></span></pre>
</div>
</div>
</body>
</html>