[CalendarServer-changes] [9497] CalendarServer/trunk/txdav/carddav/datastore/test/common.py

[source_changes at macosforge.org]

Revision: 9497
          http://trac.macosforge.org/projects/calendarserver/changeset/9497
Author:   cdaboo at apple.com
Date:     2012-07-26 08:42:25 -0700 (Thu, 26 Jul 2012)
Log Message:
-----------
Fix tests with missing yields.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/carddav/datastore/test/common.py

Modified: CalendarServer/trunk/txdav/carddav/datastore/test/common.py
===================================================================
--- CalendarServer/trunk/txdav/carddav/datastore/test/common.py	2012-07-25 22:58:27 UTC (rev 9496)
+++ CalendarServer/trunk/txdav/carddav/datastore/test/common.py	2012-07-26 15:42:25 UTC (rev 9497)
@@ -288,7 +288,7 @@
         yield self.commit()
         home = yield self.homeUnderTest()
         addressbook = yield home.addressbookWithName("some_other_name")
-        positiveAssertions()
+        yield positiveAssertions()
         # FIXME: revert
         # FIXME: test for multiple renames
         # FIXME: test for conflicting renames (a->b, c->a in the same txn)
@@ -316,6 +316,7 @@
         self.assertIdentical((yield home.addressbookWithName(name)), None)
         yield home.createAddressBookWithName(name)
         self.assertNotIdentical((yield home.addressbookWithName(name)), None)
+        @inlineCallbacks
         def checkProperties():
             addressbookProperties = (yield home.addressbookWithName(name)).properties()
             addressbookType = ResourceType.addressbook #@UndefinedVariable
@@ -325,7 +326,7 @@
                 ],
                 addressbookType
             )
-        checkProperties()
+        yield checkProperties()
         yield self.commit()
 
         # Make sure notification fired after commit
@@ -341,7 +342,7 @@
 
         # Sanity check: are the properties actually persisted?
         # FIXME: no independent testing of this right now
-        checkProperties()
+        yield checkProperties()
 
 
     @inlineCallbacks
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120726/84aa0601/attachment-0001.html>