[CalendarServer-changes] [4674] CalendarServer/branches/more-deferreds-4

[source_changes at macosforge.org]

Revision: 4674
          http://trac.macosforge.org/projects/calendarserver/changeset/4674
Author:   glyph at apple.com
Date:     2009-10-30 10:00:49 -0700 (Fri, 30 Oct 2009)
Log Message:
-----------
pull in a fix from trunk (hopefully that SVN merge metadata will help avoid conflicts...)

Modified Paths:
--------------
    CalendarServer/branches/more-deferreds-4/twistedcaldav/directory/test/test_proxyprincipalmembers.py

Property Changed:
----------------
    CalendarServer/branches/more-deferreds-4/


Property changes on: CalendarServer/branches/more-deferreds-4
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalendarServer/branches/config-separation:4379-4443
/CalendarServer/branches/egg-info-351:4589-4625
/CalendarServer/branches/more-deferreds:4446,4462
/CalendarServer/branches/more-deferreds-3:4490-4666
/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
   + /CalendarServer/branches/config-separation:4379-4443
/CalendarServer/branches/egg-info-351:4589-4625
/CalendarServer/branches/more-deferreds:4446,4462
/CalendarServer/branches/more-deferreds-3:4490-4666
/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/trunk:4672

Modified: CalendarServer/branches/more-deferreds-4/twistedcaldav/directory/test/test_proxyprincipalmembers.py
===================================================================
--- CalendarServer/branches/more-deferreds-4/twistedcaldav/directory/test/test_proxyprincipalmembers.py	2009-10-30 16:40:42 UTC (rev 4673)
+++ CalendarServer/branches/more-deferreds-4/twistedcaldav/directory/test/test_proxyprincipalmembers.py	2009-10-30 17:00:49 UTC (rev 4674)
@@ -504,5 +504,5 @@
                 parser = XMLAccountsParser(self.directoryService.xmlFile)
                 self.directoryService._parsedAccounts = parser.items
 
-                self._clearProxy(principal, proxyType)
-                self._clearProxy(fakePrincipal, proxyType)
+                yield self._clearProxy(principal, proxyType)
+                yield self._clearProxy(fakePrincipal, proxyType)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091030/e199fb01/attachment.html>