[CalendarServer-changes] [11011] CalendarServer/branches/users/glyph/q-no-master

source_changes at macosforge.org source_changes at macosforge.org
Sun Apr 7 22:22:03 PDT 2013


Revision: 11011
          http://trac.calendarserver.org//changeset/11011
Author:   glyph at apple.com
Date:     2013-04-07 22:22:03 -0700 (Sun, 07 Apr 2013)
Log Message:
-----------
Fix for test (and work around the un-availability of this method with the file back-end).

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/q-no-master/calendarserver/tap/caldav.py
    CalendarServer/branches/users/glyph/q-no-master/txdav/common/datastore/file.py

Modified: CalendarServer/branches/users/glyph/q-no-master/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/branches/users/glyph/q-no-master/calendarserver/tap/caldav.py	2013-04-08 05:21:53 UTC (rev 11010)
+++ CalendarServer/branches/users/glyph/q-no-master/calendarserver/tap/caldav.py	2013-04-08 05:22:03 UTC (rev 11011)
@@ -1427,8 +1427,7 @@
             from twisted.internet import reactor
             pool = PeerConnectionPool(reactor, store.newTransaction,
                                       7654, schema)
-            store.queuer = pool
-
+            store.queuer = store.queuer.transferProposalCallbacks(pool)
             controlSocket.addFactory(_QUEUE_ROUTE,
                                      pool.workerListenerFactory())
             # TODO: now that we have the shared control socket, we should get

Modified: CalendarServer/branches/users/glyph/q-no-master/txdav/common/datastore/file.py
===================================================================
--- CalendarServer/branches/users/glyph/q-no-master/txdav/common/datastore/file.py	2013-04-08 05:21:53 UTC (rev 11010)
+++ CalendarServer/branches/users/glyph/q-no-master/txdav/common/datastore/file.py	2013-04-08 05:22:03 UTC (rev 11011)
@@ -77,6 +77,14 @@
 )
 UIDPATH = "__uids__"
 
+
+
+class _StubQueuer(object):
+    def transferProposalCallbacks(self, otherQueuer):
+        return otherQueuer
+
+
+
 class CommonDataStore(DataStore):
     """
     Shared logic for SQL-based data stores, between calendar and addressbook
@@ -87,7 +95,6 @@
 
     @ivar quota: the amount of space granted to each calendar home (in bytes)
         for storing attachments, or C{None} if quota should not be enforced.
-
     @type quota: C{int} or C{NoneType}
 
     @ivar _propertyStoreClass: The class (or callable object / factory) that
@@ -95,6 +102,10 @@
         signature of the L{XattrPropertyStore} type: take 2 arguments
         C{(default-user-uid, path-factory)}, return an L{IPropertyStore}
         provider.
+
+    @ivar queuer: For compatibility with SQL-based store; currently a
+        non-functional implementation just for tests, but could be fixed to be
+        backed by SQLite or something.
     """
     implements(ICalendarStore)
 
@@ -118,6 +129,8 @@
         self._migrating = False
         self._enableNotifications = True
         self._newTransactionCallbacks = set()
+        # FIXME: see '@ivar queuer' above.
+        self.queuer = _StubQueuer()
 
     def callWithNewTransactions(self, callback):
         """
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130407/8360eb32/attachment-0001.html>


More information about the calendarserver-changes mailing list