[CalendarServer-changes] [4559] CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav

[source_changes at macosforge.org]

Revision: 4559
          http://trac.macosforge.org/projects/calendarserver/changeset/4559
Author:   cdaboo at apple.com
Date:     2009-09-29 09:50:16 -0700 (Tue, 29 Sep 2009)
Log Message:
-----------
Tweak some tests.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/directory/test/test_principal.py
    CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/directory/test/test_proxyprincipalmembers.py
    CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/test/test_database.py

Modified: CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/directory/test/test_principal.py
===================================================================
--- CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/directory/test/test_principal.py	2009-09-28 20:37:17 UTC (rev 4558)
+++ CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/directory/test/test_principal.py	2009-09-29 16:50:16 UTC (rev 4559)
@@ -25,7 +25,7 @@
 
 from twistedcaldav.static import CalendarHomeProvisioningFile
 from twistedcaldav.config import config
-from twistedcaldav.directory import augment
+from twistedcaldav.directory import augment, calendaruserproxy
 from twistedcaldav.directory.directory import DirectoryService
 from twistedcaldav.directory.xmlfile import XMLDirectoryService
 from twistedcaldav.directory.test.test_xmlfile import xmlFile, augmentsFile
@@ -67,6 +67,7 @@
             self.principalRootResources[directory.__class__.__name__] = provisioningResource
 
         augment.AugmentService = augment.AugmentXMLDB(xmlFiles=(augmentsFile.path,))
+        calendaruserproxy.ProxyDBService = calendaruserproxy.ProxySqliteDB(self.mktemp())
 
     def test_hierarchy(self):
         """

Modified: CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/directory/test/test_proxyprincipalmembers.py
===================================================================
--- CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/directory/test/test_proxyprincipalmembers.py	2009-09-28 20:37:17 UTC (rev 4558)
+++ CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/directory/test/test_proxyprincipalmembers.py	2009-09-29 16:50:16 UTC (rev 4559)
@@ -27,7 +27,7 @@
 
 import twistedcaldav.test.util
 from twistedcaldav.config import config
-from twistedcaldav.directory import augment
+from twistedcaldav.directory import augment, calendaruserproxy
 from twistedcaldav.directory.calendaruserproxyloader import XMLCalendarUserProxyLoader
 import os
 
@@ -42,6 +42,7 @@
 
         self.directoryService = XMLDirectoryService({'xmlFile' : xmlFile})
         augment.AugmentService = augment.AugmentXMLDB(xmlFiles=(augmentsFile.path,))
+        calendaruserproxy.ProxyDBService = calendaruserproxy.ProxySqliteDB(self.mktemp())
 
         # Set up a principals hierarchy for each service we're testing with
         self.principalRootResources = {}
@@ -100,7 +101,7 @@
             proxyPrincipal = self._getPrincipalByShortName(proxyPrincipal[0], proxyPrincipal[1])
         members.add(proxyPrincipal)
         
-        principal.setGroupMemberSetPrincipals(members)
+        yield principal.setGroupMemberSetPrincipals(members)
 
     @inlineCallbacks
     def _removeProxy(self, recordType, recordName, subPrincipalName, proxyRecordType, proxyRecordName):
@@ -115,14 +116,15 @@
                 members.remove(p)
                 break
         
-        principal.setGroupMemberSetPrincipals(members)
+        yield principal.setGroupMemberSetPrincipals(members)
 
+    @inlineCallbacks
     def _clearProxy(self, principal, subPrincipalName):
 
         if isinstance(principal, tuple):
             principal = self._getPrincipalByShortName(principal[0], principal[1])
         principal = principal.getChild(subPrincipalName)
-        principal.setGroupMemberSetPrincipals(set())
+        yield principal.setGroupMemberSetPrincipals(set())
 
     @inlineCallbacks
     def _proxyForTest(self, recordType, recordName, expectedProxies, read_write):
@@ -304,7 +306,7 @@
 
             self.assertEquals(notifier.changedCount, 0)
 
-            proxyGroup.setGroupMemberSet(
+            yield proxyGroup.setGroupMemberSet(
                 davxml.GroupMemberSet(
                     davxml.HRef.fromString(
                         "/XMLDirectoryService/__uids__/5FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1/")),
@@ -377,6 +379,7 @@
 
         # Set up the in-memory (non-null) memcacher:
         config.ProcessType = "Single"
+        calendaruserproxy.ProxyDBService._memcacher._memcacheProtocol = None
         principal = self._getPrincipalByShortName(
             DirectoryService.recordType_users, "wsanchez")
         db = principal._calendar_user_proxy_index()
@@ -522,5 +525,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)

Modified: CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/test/test_database.py
===================================================================
--- CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/test/test_database.py	2009-09-28 20:37:17 UTC (rev 4558)
+++ CalendarServer/branches/users/cdaboo/partition-4464/twistedcaldav/test/test_database.py	2009-09-29 16:50:16 UTC (rev 4559)
@@ -14,7 +14,7 @@
 # limitations under the License.
 ##
 
-from twistedcaldav.database import AbstractADBAPIDatabase
+from twistedcaldav.database import AbstractADBAPIDatabase, ADBAPISqliteMixin
 import twistedcaldav.test.util
 
 from twisted.internet.defer import inlineCallbacks
@@ -27,7 +27,7 @@
     Test abstract SQL DB class
     """
     
-    class TestDB(AbstractADBAPIDatabase):
+    class TestDB(ADBAPISqliteMixin, AbstractADBAPIDatabase):
         
         def __init__(self, path, persistent=False, version="1"):
             self.version = version
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090929/eb9da440/attachment.html>