[CalendarServer-changes] [10068] CalendarServer/branches/users/glyph/one-home-list-api

[source_changes at macosforge.org]

Revision: 10068
          http://trac.calendarserver.org//changeset/10068
Author:   glyph at apple.com
Date:     2012-11-16 14:49:10 -0800 (Fri, 16 Nov 2012)
Log Message:
-----------
Suppress AlreadyCalledError if something went wrong.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/one-home-list-api/txdav/common/datastore/upgrade/test/test_migrate.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/one-home-list-api/

Modified: CalendarServer/branches/users/glyph/one-home-list-api/txdav/common/datastore/upgrade/test/test_migrate.py
===================================================================
--- CalendarServer/branches/users/glyph/one-home-list-api/txdav/common/datastore/upgrade/test/test_migrate.py	2012-11-16 22:49:08 UTC (rev 10067)
+++ CalendarServer/branches/users/glyph/one-home-list-api/txdav/common/datastore/upgrade/test/test_migrate.py	2012-11-16 22:49:10 UTC (rev 10068)
@@ -156,7 +156,8 @@
         class StubService(Service, object):
             def startService(self):
                 super(StubService, self).startService()
-                subStarted.callback(None)
+                if not subStarted.called:
+                    subStarted.callback(None)
         from twisted.python import log
         def justOnce(evt):
             if evt.get('isError') and not hasattr(subStarted, 'result'):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20121116/a7119703/attachment.html>