[CalendarServer-changes] [6030] CalendarServer/branches/users/glyph/sql-store/twistedcaldav/test

[source_changes at macosforge.org]

Revision: 6030
          http://trac.macosforge.org/projects/calendarserver/changeset/6030
Author:   glyph at apple.com
Date:     2010-08-10 08:48:23 -0700 (Tue, 10 Aug 2010)
Log Message:
-----------
Enable addressbook storebridge tests for database backend.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/sql-store/twistedcaldav/test/test_wrapping.py
    CalendarServer/branches/users/glyph/sql-store/twistedcaldav/test/util.py

Modified: CalendarServer/branches/users/glyph/sql-store/twistedcaldav/test/test_wrapping.py
===================================================================
--- CalendarServer/branches/users/glyph/sql-store/twistedcaldav/test/test_wrapping.py	2010-08-10 15:32:43 UTC (rev 6029)
+++ CalendarServer/branches/users/glyph/sql-store/twistedcaldav/test/test_wrapping.py	2010-08-10 15:48:23 UTC (rev 6030)
@@ -48,6 +48,7 @@
 from txcaldav.calendarstore.test.common import StubNotifierFactory, \
     assertProvides
 from txcaldav.icalendarstore import ICalendarHome
+from txcarddav.iaddressbookstore import IAddressBookHome
 
 
 
@@ -347,7 +348,7 @@
         Creating a AddressBookHomeProvisioningFile will create a paired
         AddressBookStore.
         """
-        self.assertIsInstance(self.addressbookCollection._newStore, AddressBookStore)
+        assertProvides(self, IDataStore, self.addressbookCollection._newStore)
 
 
     @inlineCallbacks
@@ -359,7 +360,7 @@
         """
         calDavFile = yield self.getResource("addressbooks/users/wsanchez/")
         self.commit()
-        self.assertIsInstance(calDavFile._newStoreHome, AddressBookHome)
+        assertProvides(self, IAddressBookHome, calDavFile._newStoreHome)
 
 
     @inlineCallbacks
@@ -436,15 +437,4 @@
         return self.calendarStore
 
 
-    def noTest(self):
-        raise SkipTest("no addressbooks yet")
 
-    pathTypes = ['calendar']
-
-    test_createAddressBookStore = noTest
-    test_lookupExistingAddressBook = noTest
-    test_lookupNewAddressBook = noTest
-    test_lookupNewAddressBookObject = noTest
-    test_lookupAddressBookObject = noTest
-    test_lookupAddressBookHome = noTest
-

Modified: CalendarServer/branches/users/glyph/sql-store/twistedcaldav/test/util.py
===================================================================
--- CalendarServer/branches/users/glyph/sql-store/twistedcaldav/test/util.py	2010-08-10 15:32:43 UTC (rev 6029)
+++ CalendarServer/branches/users/glyph/sql-store/twistedcaldav/test/util.py	2010-08-10 15:48:23 UTC (rev 6030)
@@ -463,7 +463,6 @@
 
 
 
-
 class InMemoryPropertyStore(object):
     def __init__(self):
         class _FauxPath(object):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100810/fac73401/attachment-0001.html>