[CalendarServer-changes] [2497] CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py

[source_changes at macosforge.org]

Revision: 2497
          http://trac.macosforge.org/projects/calendarserver/changeset/2497
Author:   wsanchez at apple.com
Date:     2008-05-25 11:27:29 -0700 (Sun, 25 May 2008)

Log Message:
-----------
Ixnay on the eferredGeneratorsday

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py	2008-05-25 18:03:14 UTC (rev 2496)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py	2008-05-25 18:27:29 UTC (rev 2497)
@@ -16,8 +16,7 @@
 
 import os
 
-from twisted.internet.defer import deferredGenerator
-from twisted.internet.defer import waitForDeferred
+from twisted.internet.defer import inlineCallbacks
 from twisted.web2.dav import davxml
 from twisted.web2.dav.fileop import rmdir
 from twisted.web2.dav.resource import AccessDeniedError
@@ -239,26 +238,22 @@
         for provisioningResource, recordType, recordResource, record in self._allRecords():
             self.failUnless(recordResource.displayName())
 
-    @deferredGenerator
+    @inlineCallbacks
     def test_groupMembers(self):
         """
         DirectoryPrincipalResource.groupMembers()
         """
         for provisioningResource, recordType, recordResource, record in self._allRecords():
-            d = waitForDeferred(recordResource.groupMembers())
-            yield d
-            members = d.getResult()
+            members = yield recordResource.groupMembers()
             self.failUnless(set(record.members()).issubset(set(r.record for r in members)))
 
-    @deferredGenerator
+    @inlineCallbacks
     def test_groupMemberships(self):
         """
         DirectoryPrincipalResource.groupMemberships()
         """
         for provisioningResource, recordType, recordResource, record in self._allRecords():
-            d = waitForDeferred(recordResource.groupMemberships())
-            yield d
-            memberships = d.getResult()
+            memberships = yield recordResource.groupMemberships()
             self.failUnless(set(record.groups()).issubset(set(r.record for r in memberships if hasattr(r, "record"))))
 
     def test_proxies(self):

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080525/0831c70c/attachment.htm