[CalendarServer-changes] [6546] CalendarServer/branches/users/glyph/sharedpool/txdav/caldav/ datastore/test/test_sql.py

[source_changes at macosforge.org]

Revision: 6546
          http://trac.macosforge.org/projects/calendarserver/changeset/6546
Author:   glyph at apple.com
Date:     2010-11-01 14:31:07 -0700 (Mon, 01 Nov 2010)
Log Message:
-----------
more missing yields

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/sharedpool/txdav/caldav/datastore/test/test_sql.py

Modified: CalendarServer/branches/users/glyph/sharedpool/txdav/caldav/datastore/test/test_sql.py
===================================================================
--- CalendarServer/branches/users/glyph/sharedpool/txdav/caldav/datastore/test/test_sql.py	2010-11-01 21:30:41 UTC (rev 6545)
+++ CalendarServer/branches/users/glyph/sharedpool/txdav/caldav/datastore/test/test_sql.py	2010-11-01 21:31:07 UTC (rev 6546)
@@ -44,7 +44,7 @@
 
     @inlineCallbacks
     def setUp(self):
-        super(CalendarSQLStorageTests, self).setUp()
+        yield super(CalendarSQLStorageTests, self).setUp()
         self._sqlCalendarStore = yield buildStore(self, self.notifierFactory)
         yield self.populate()
 
@@ -86,7 +86,7 @@
         """
         Assert that two objects with C{properties} methods have similar
         properties.
-        
+
         @param disregard: a list of L{PropertyName} keys to discard from both
             input and output.
         """
@@ -201,7 +201,7 @@
         operations, that we do not block other reads of the table.
         """
 
-        calendarStore = yield buildStore(self, self.notifierFactory)
+        calendarStore = self._sqlCalendarStore
 
         txn1 = calendarStore.newTransaction()
         txn2 = calendarStore.newTransaction()
@@ -211,7 +211,7 @@
         # reads of existing data in the table
         home_uid2 = yield txn3.homeWithUID(ECALENDARTYPE, "uid2", create=True)
         self.assertNotEqual(home_uid2, None)
-        txn3.commit()
+        yield txn3.commit()
 
         home_uid1_1 = yield txn1.homeWithUID(
             ECALENDARTYPE, "uid1", create=True
@@ -237,7 +237,7 @@
         txn4 = calendarStore.newTransaction()
         home_uid2 = yield txn4.homeWithUID(ECALENDARTYPE, "uid2", create=True)
         self.assertNotEqual(home_uid2, None)
-        txn4.commit()
+        yield txn4.commit()
 
         # Now do the concurrent provision attempt
         yield d2
@@ -254,13 +254,13 @@
         resources to the same address book home does not cause a deadlock.
         """
 
-        calendarStore = yield buildStore(self, self.notifierFactory)
+        calendarStore = self._sqlCalendarStore
 
         # Provision the home now
         txn = calendarStore.newTransaction()
         home = yield txn.homeWithUID(ECALENDARTYPE, "uid1", create=True)
         self.assertNotEqual(home, None)
-        txn.commit()
+        yield txn.commit()
 
         txn1 = calendarStore.newTransaction()
         txn2 = calendarStore.newTransaction()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101101/42f69e8d/attachment-0001.html>