<!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>[15143] CalendarServer/trunk/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/15143">15143</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-09-22 07:17:15 -0700 (Tue, 22 Sep 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Make sure notification collection child object names always have a .xml suffix.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_sql_externalpy">CalendarServer/trunk/txdav/caldav/datastore/test/test_sql_external.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_sql_sharingpy">CalendarServer/trunk/txdav/caldav/datastore/test/test_sql_sharing.py</a></li>
<li><a href="#CalendarServertrunktxdavcarddavdatastoretesttest_sql_sharingpy">CalendarServer/trunk/txdav/carddav/datastore/test/test_sql_sharing.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_notificationpy">CalendarServer/trunk/txdav/common/datastore/sql_notification.py</a></li>
<li><a href="#CalendarServertrunktxdavwhotesttest_group_shareespy">CalendarServer/trunk/txdav/who/test/test_group_sharees.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_sql_externalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql_external.py (15142 => 15143)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql_external.py        2015-09-21 14:34:01 UTC (rev 15142)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql_external.py        2015-09-22 14:17:15 UTC (rev 15143)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.theTransactionUnderTest(1).notificationsWithUID(&quot;puser02&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(notifications, [inviteUID, ])
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;.xml&quot;, ])
</ins><span class="cx">         yield self.commitTransaction(1)
</span><span class="cx"> 
</span><span class="cx">         # Uninvite
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.theTransactionUnderTest(0).notificationsWithUID(&quot;user01&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(notifications, [inviteUID + &quot;-reply&quot;, ])
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;-reply.xml&quot;, ])
</ins><span class="cx"> 
</span><span class="cx">         calendar = yield self.calendarUnderTest(txn=self.theTransactionUnderTest(0), home=&quot;user01&quot;, name=&quot;calendar&quot;)
</span><span class="cx">         self.assertTrue(calendar.isShared())
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.theTransactionUnderTest(0).notificationsWithUID(&quot;user01&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(notifications, [inviteUID + &quot;-reply&quot;, ])
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;-reply.xml&quot;, ])
</ins><span class="cx"> 
</span><span class="cx">         calendar = yield self.calendarUnderTest(txn=self.theTransactionUnderTest(0), home=&quot;user01&quot;, name=&quot;calendar&quot;)
</span><span class="cx">         self.assertTrue(calendar.isShared())
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.theTransactionUnderTest(0).notificationsWithUID(&quot;user01&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(notifications, [inviteUID + &quot;-reply&quot;, ])
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;-reply.xml&quot;, ])
</ins><span class="cx"> 
</span><span class="cx">         calendar = yield self.calendarUnderTest(txn=self.theTransactionUnderTest(0), home=&quot;user01&quot;, name=&quot;calendar&quot;)
</span><span class="cx">         self.assertTrue(calendar.isShared())
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.theTransactionUnderTest(0).notificationsWithUID(&quot;user01&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(notifications, [inviteUID + &quot;-reply&quot;, ])
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;-reply.xml&quot;, ])
</ins><span class="cx"> 
</span><span class="cx">         calendar = yield self.calendarUnderTest(txn=self.theTransactionUnderTest(0), home=&quot;user01&quot;, name=&quot;calendar&quot;)
</span><span class="cx">         self.assertTrue(calendar.isShared())
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.theTransactionUnderTest(0).notificationsWithUID(&quot;user01&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(notifications, [inviteUID + &quot;-reply&quot;, ])
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;-reply.xml&quot;, ])
</ins><span class="cx"> 
</span><span class="cx">         calendar = yield self.calendarUnderTest(txn=self.theTransactionUnderTest(0), home=&quot;user01&quot;, name=&quot;calendar&quot;)
</span><span class="cx">         self.assertTrue(calendar.isShared())
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.theTransactionUnderTest(0).notificationsWithUID(&quot;user01&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(notifications, [inviteUID + &quot;-reply&quot;, ])
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;-reply.xml&quot;, ])
</ins><span class="cx"> 
</span><span class="cx">         calendar = yield self.calendarUnderTest(txn=self.theTransactionUnderTest(0), home=&quot;user01&quot;, name=&quot;calendar&quot;)
</span><span class="cx">         self.assertTrue(calendar.isShared())
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.theTransactionUnderTest(0).notificationsWithUID(&quot;user01&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(notifications, [inviteUID + &quot;-reply&quot;, ])
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;-reply.xml&quot;, ])
</ins><span class="cx"> 
</span><span class="cx">         yield self.commitTransaction(0)
</span><span class="cx"> 
</span><span class="lines">@@ -416,7 +416,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.theTransactionUnderTest(0).notificationsWithUID(&quot;user01&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(notifications, [inviteUID + &quot;-reply&quot;, ])
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;-reply.xml&quot;, ])
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_sql_sharingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql_sharing.py (15142 => 15143)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql_sharing.py        2015-09-21 14:34:01 UTC (rev 15142)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql_sharing.py        2015-09-22 14:17:15 UTC (rev 15143)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.transactionUnderTest().notificationsWithUID(&quot;user02&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(notifications, [inviteUID, ])
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;.xml&quot;, ])
</ins><span class="cx"> 
</span><span class="cx">         self.assertTrue(calendar.isShared())
</span><span class="cx"> 
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.transactionUnderTest().notificationsWithUID(&quot;user02&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(len(notifications), 1)
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;.xml&quot;, ])
</ins><span class="cx"> 
</span><span class="cx">         self.assertTrue(calendar.isShared())
</span><span class="cx"> 
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.transactionUnderTest().notificationsWithUID(&quot;user01&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(notifications, [inviteUID + &quot;-reply&quot;, ])
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;-reply.xml&quot;, ])
</ins><span class="cx"> 
</span><span class="cx">         calendar = yield self.calendarUnderTest(home=&quot;user01&quot;, name=&quot;calendar&quot;)
</span><span class="cx">         self.assertTrue(calendar.isShared())
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.transactionUnderTest().notificationsWithUID(&quot;user01&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(notifications, [inviteUID + &quot;-reply&quot;, ])
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;-reply.xml&quot;, ])
</ins><span class="cx"> 
</span><span class="cx">         calendar = yield self.calendarUnderTest(home=&quot;user01&quot;, name=&quot;calendar&quot;)
</span><span class="cx">         self.assertTrue(calendar.isShared())
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.transactionUnderTest().notificationsWithUID(&quot;user02&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(len(notifications), 1)
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;.xml&quot;, ])
</ins><span class="cx"> 
</span><span class="cx">         self.assertTrue(calendar.isShared())
</span><span class="cx"> 
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.transactionUnderTest().notificationsWithUID(&quot;user01&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(notifications, [inviteUID + &quot;-reply&quot;, ])
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;-reply.xml&quot;, ])
</ins><span class="cx"> 
</span><span class="cx">         calendar = yield self.calendarUnderTest(home=&quot;user01&quot;, name=&quot;calendar&quot;)
</span><span class="cx">         self.assertTrue(calendar.isShared())
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.transactionUnderTest().notificationsWithUID(&quot;user01&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(notifications, [inviteUID + &quot;-reply&quot;, ])
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;-reply.xml&quot;, ])
</ins><span class="cx"> 
</span><span class="cx">         calendar = yield self.calendarUnderTest(home=&quot;user01&quot;, name=&quot;calendar&quot;)
</span><span class="cx">         self.assertTrue(calendar.isShared())
</span><span class="lines">@@ -337,7 +337,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.transactionUnderTest().notificationsWithUID(&quot;user02&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(len(notifications), 1)
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;.xml&quot;, ])
</ins><span class="cx"> 
</span><span class="cx">         self.assertTrue(calendar.isShared())
</span><span class="cx"> 
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.transactionUnderTest().notificationsWithUID(&quot;user01&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(notifications, [inviteUID + &quot;-reply&quot;, ])
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;-reply.xml&quot;, ])
</ins><span class="cx"> 
</span><span class="cx">         calendar = yield self.calendarUnderTest(home=&quot;user01&quot;, name=&quot;calendar&quot;)
</span><span class="cx">         self.assertTrue(calendar.isShared())
</span><span class="lines">@@ -368,7 +368,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.transactionUnderTest().notificationsWithUID(&quot;user01&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(notifications, [inviteUID + &quot;-reply&quot;, ])
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;-reply.xml&quot;, ])
</ins><span class="cx"> 
</span><span class="cx">         calendar = yield self.calendarUnderTest(home=&quot;user01&quot;, name=&quot;calendar&quot;)
</span><span class="cx">         self.assertTrue(calendar.isShared())
</span><span class="lines">@@ -397,7 +397,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.transactionUnderTest().notificationsWithUID(&quot;user02&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(len(notifications), 1)
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;.xml&quot;, ])
</ins><span class="cx"> 
</span><span class="cx">         yield self.commit()
</span><span class="cx"> 
</span><span class="lines">@@ -410,7 +410,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.transactionUnderTest().notificationsWithUID(&quot;user01&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(notifications, [inviteUID + &quot;-reply&quot;, ])
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;-reply.xml&quot;, ])
</ins><span class="cx"> 
</span><span class="cx">         yield self.commit()
</span><span class="cx"> 
</span><span class="lines">@@ -423,7 +423,7 @@
</span><span class="cx"> 
</span><span class="cx">         notifyHome = yield self.transactionUnderTest().notificationsWithUID(&quot;user01&quot;)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(notifications, [inviteUID + &quot;-reply&quot;, ])
</del><ins>+        self.assertEqual(notifications, [inviteUID + &quot;-reply.xml&quot;, ])
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span><span class="lines">@@ -706,7 +706,7 @@
</span><span class="cx">     def _check_notifications(self, uid, items):
</span><span class="cx">         notifyHome = yield self.transactionUnderTest().notificationsWithUID(uid, create=True)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(set(notifications), set(items))
</del><ins>+        self.assertEqual(set(notifications), set([item + &quot;.xml&quot; for item in items]))
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServertrunktxdavcarddavdatastoretesttest_sql_sharingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/carddav/datastore/test/test_sql_sharing.py (15142 => 15143)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/carddav/datastore/test/test_sql_sharing.py        2015-09-21 14:34:01 UTC (rev 15142)
+++ CalendarServer/trunk/txdav/carddav/datastore/test/test_sql_sharing.py        2015-09-22 14:17:15 UTC (rev 15143)
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx">     def _check_notifications(self, home, items):
</span><span class="cx">         notifyHome = yield self.transactionUnderTest().notificationsWithUID(home, create=True)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(set(notifications), set(items))
</del><ins>+        self.assertEqual(set(notifications), set([item + &quot;.xml&quot; for item in items]))
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_notificationpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_notification.py (15142 => 15143)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_notification.py        2015-09-21 14:34:01 UTC (rev 15142)
+++ CalendarServer/trunk/txdav/common/datastore/sql_notification.py        2015-09-22 14:17:15 UTC (rev 15143)
</span><span class="lines">@@ -386,10 +386,14 @@
</span><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span><span class="cx">     def listNotificationObjects(self):
</span><ins>+        &quot;&quot;&quot;
+        List the names of all notification objects in this collection. Note that the name
+        is actually the UID value with &quot;.xml&quot; appended, as per L{NotificationObject.name}.
+        &quot;&quot;&quot;
</ins><span class="cx">         if self._notificationNames is None:
</span><span class="cx">             rows = yield self._notificationUIDsForHomeQuery.on(
</span><span class="cx">                 self._txn, resourceID=self._resourceID)
</span><del>-            self._notificationNames = sorted([row[0] for row in rows])
</del><ins>+            self._notificationNames = sorted([row[0] + &quot;.xml&quot; for row in rows])
</ins><span class="cx">         returnValue(self._notificationNames)
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -432,18 +436,18 @@
</span><span class="cx">             inserting = True
</span><span class="cx">         yield notificationObject.setData(uid, notificationtype, notificationdata, inserting=inserting)
</span><span class="cx">         if inserting:
</span><del>-            yield self._insertRevision(&quot;%s.xml&quot; % (uid,))
</del><ins>+            yield self._insertRevision(notificationObject.name())
</ins><span class="cx">             if self._notificationNames is not None:
</span><del>-                self._notificationNames.append(notificationObject.uid())
</del><ins>+                self._notificationNames.append(notificationObject.name())
</ins><span class="cx">         else:
</span><del>-            yield self._updateRevision(&quot;%s.xml&quot; % (uid,))
</del><ins>+            yield self._updateRevision(notificationObject.name())
</ins><span class="cx">         yield self.notifyChanged()
</span><span class="cx">         returnValue(notificationObject)
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     def removeNotificationObjectWithName(self, name):
</span><span class="cx">         if self._notificationNames is not None:
</span><del>-            self._notificationNames.remove(self._nameToUID(name))
</del><ins>+            self._notificationNames.remove(name)
</ins><span class="cx">         return self.removeNotificationObjectWithUID(self._nameToUID(name))
</span><span class="cx"> 
</span><span class="cx">     _removeByUIDQuery = Delete(
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhotesttest_group_shareespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/test_group_sharees.py (15142 => 15143)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/test_group_sharees.py        2015-09-21 14:34:01 UTC (rev 15142)
+++ CalendarServer/trunk/txdav/who/test/test_group_sharees.py        2015-09-22 14:17:15 UTC (rev 15143)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">     def _check_notifications(self, uid, items):
</span><span class="cx">         notifyHome = yield self.transactionUnderTest().notificationsWithUID(uid, create=True)
</span><span class="cx">         notifications = yield notifyHome.listNotificationObjects()
</span><del>-        self.assertEqual(set(notifications), set(items))
</del><ins>+        self.assertEqual(set(notifications), set([item + &quot;.xml&quot; for item in items]))
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span></span></pre>
</div>
</div>

</body>
</html>