[CalendarServer-changes] [11170] CalendarServer/branches/users/gaya/sharedgroups-3

[source_changes at macosforge.org]

Revision: 11170
          http://trac.calendarserver.org//changeset/11170
Author:   gaya at apple.com
Date:     2013-05-10 23:09:42 -0700 (Fri, 10 May 2013)
Log Message:
-----------
fix more tests

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/test/test_addressbookquery.py
    CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql.py

Modified: CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/test/test_addressbookquery.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/test/test_addressbookquery.py	2013-05-11 00:48:13 UTC (rev 11169)
+++ CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/test/test_addressbookquery.py	2013-05-11 06:09:42 UTC (rev 11170)
@@ -42,7 +42,7 @@
         uid = "ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson"
 
         return self.simple_vcard_query(
-            "/addressbook_query_uid/",
+            "/addressbook/",
             carddavxml.PropertyFilter(
                 carddavxml.TextMatch.fromString(uid),
                 name="UID",
@@ -57,7 +57,7 @@
         """
         uids = [r[0] for r in (os.path.splitext(f) for f in os.listdir(self.vcards_dir)) if r[1] == ".vcf"]
 
-        return self.simple_vcard_query("/addressbook_query_vcards/", None, uids)
+        return self.simple_vcard_query("/addressbook/", None, uids)
 
 
     def test_addressbook_query_limited_with_data(self):
@@ -77,7 +77,7 @@
 
         uids = [r[0] for r in (os.path.splitext(f) for f in os.listdir(self.vcards_dir)) if r[1] == ".vcf"]
 
-        d = self.simple_vcard_query("/addressbook_query_vcards/", None, uids, limit=1)
+        d = self.simple_vcard_query("/addressbook/", None, uids, limit=1)
         d.addCallbacks(_restoreValueOK, _restoreValueError)
         return d
 
@@ -99,7 +99,7 @@
 
         uids = [r[0] for r in (os.path.splitext(f) for f in os.listdir(self.vcards_dir)) if r[1] == ".vcf"]
 
-        d = self.simple_vcard_query("/addressbook_query_vcards/", None, uids, withData=False)
+        d = self.simple_vcard_query("/addressbook/", None, uids, withData=False)
         d.addCallbacks(_restoreValueOK, _restoreValueError)
         return d
 
@@ -174,7 +174,7 @@
 
     @inlineCallbacks
     def addressbook_query(self, addressbook_uri, query, got_xml):
-
+        '''
         mkcol = """<?xml version="1.0" encoding="utf-8" ?>
 <D:mkcol xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
 <D:set>
@@ -190,7 +190,7 @@
 
         if response.code != responsecode.CREATED:
             self.fail("MKCOL failed: %s" % (response.code,))
-
+        '''
         # Add vCards to addressbook
         for child in FilePath(self.vcards_dir).children():
             if os.path.splitext(child.basename())[1] != ".vcf":

Modified: CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql.py	2013-05-11 00:48:13 UTC (rev 11169)
+++ CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql.py	2013-05-11 06:09:42 UTC (rev 11170)
@@ -1763,10 +1763,12 @@
         if child is None:
             raise NoSuchHomeChildError()
 
-        resourceID = child._resourceID
+        #resourceID = child._resourceID
         yield child.remove()
         self._children.pop(name, None)
-        self._children.pop(resourceID, None)
+        # FIX ME:  need to keep resourceID around so that default calendars work:
+        # see twistedcaldav.scheduling_store.caldav.test.test_resource.DefaultCalendar.test_missing_default_vevent_calendar
+        # self._children.pop(resourceID, None)
 
 
     @classproperty
@@ -2693,6 +2695,7 @@
 
         # Must send notification to ensure cache invalidation occurs
         yield self.notifyChanged()
+        yield shareeHome.notifyChanged()
 
         returnValue(bindName)
 
@@ -2771,6 +2774,7 @@
 
             # Must send notification to ensure cache invalidation occurs
             yield self.notifyChanged()
+            yield shareeView.viewerHome().notifyChanged()
 
         returnValue(shareeView._name)
 
@@ -2798,6 +2802,7 @@
 
                 # Must send notification to ensure cache invalidation occurs
                 yield self.notifyChanged()
+                yield shareeHome.notifyChanged()
                 break
 
         # delete binds including invites
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130510/b4eecb5c/attachment.html>