[CalendarServer-changes] [10288] CalendarServer/branches/users/glyph/queue-locking-and-timing

[source_changes at macosforge.org]

Revision: 10288
          http://trac.calendarserver.org//changeset/10288
Author:   glyph at apple.com
Date:     2013-01-04 16:40:01 -0800 (Fri, 04 Jan 2013)
Log Message:
-----------
Wrap it in a maybeDeferred since file backend doesn't return Deferreds here.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/queue-locking-and-timing/twistedcaldav/test/test_wrapping.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/queue-locking-and-timing/

Modified: CalendarServer/branches/users/glyph/queue-locking-and-timing/twistedcaldav/test/test_wrapping.py
===================================================================
--- CalendarServer/branches/users/glyph/queue-locking-and-timing/twistedcaldav/test/test_wrapping.py	2013-01-05 00:40:00 UTC (rev 10287)
+++ CalendarServer/branches/users/glyph/queue-locking-and-timing/twistedcaldav/test/test_wrapping.py	2013-01-05 00:40:01 UTC (rev 10288)
@@ -54,6 +54,7 @@
 from txdav.caldav.icalendarstore import ICalendarHome
 from txdav.carddav.iaddressbookstore import IAddressBookHome
 
+from twisted.internet.defer import maybeDeferred
 from txdav.caldav.datastore.file import Calendar
 
 
@@ -248,8 +249,10 @@
                                       % (pathType, pathType))
             yield req.process()
             self.assertEquals(req.chanRequest.code, 404)
-            yield self.failUnlessFailure(req._newStoreTransaction.commit(),
-                                         AlreadyFinishedError)
+            yield self.failUnlessFailure(
+                maybeDeferred(req._newStoreTransaction.commit),
+                AlreadyFinishedError
+            )
 
 
     @inlineCallbacks
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130104/2f17cf19/attachment.html>