[CalendarServer-changes] [5948] CalendarServer/branches/new-store-no-caldavfile-2/twistedcaldav/test /test_sharing.py

[source_changes at macosforge.org]

Revision: 5948
          http://trac.macosforge.org/projects/calendarserver/changeset/5948
Author:   glyph at apple.com
Date:     2010-07-26 14:39:35 -0700 (Mon, 26 Jul 2010)
Log Message:
-----------
remove test dependence on CalDAVFile (not quite working yet, though)

Modified Paths:
--------------
    CalendarServer/branches/new-store-no-caldavfile-2/twistedcaldav/test/test_sharing.py

Modified: CalendarServer/branches/new-store-no-caldavfile-2/twistedcaldav/test/test_sharing.py
===================================================================
--- CalendarServer/branches/new-store-no-caldavfile-2/twistedcaldav/test/test_sharing.py	2010-07-26 21:38:25 UTC (rev 5947)
+++ CalendarServer/branches/new-store-no-caldavfile-2/twistedcaldav/test/test_sharing.py	2010-07-26 21:39:35 UTC (rev 5948)
@@ -23,13 +23,10 @@
 from twisted.internet.defer import inlineCallbacks, returnValue, succeed
 from twistedcaldav import customxml
 from twistedcaldav.config import config
-from twistedcaldav.static import CalDAVFile
-from twistedcaldav.test.util import InMemoryPropertyStore
-from twistedcaldav.test.util import TestCase
-import os
+from twistedcaldav.test.util import HomeTestCase
 
 
-class SharingTests(TestCase):
+class SharingTests(HomeTestCase):
 
     class FakePrincipal(object):
         
@@ -50,25 +47,25 @@
             return self.displayname
             
 
+    @inlineCallbacks
     def setUp(self):
-        super(SharingTests, self).setUp()
-        config.Sharing.Enabled = True
-        config.Sharing.Calendars.Enabled = True
+        self.patch(config.Sharing, "Enabled", True)
+        self.patch(config.Sharing.Calendars, "Enabled", True)
 
-        collection = self.mktemp()
-        os.mkdir(collection)
-        self.resource = CalDAVFile(collection, self.site.resource)
-        self.resource._dead_properties = InMemoryPropertyStore()
-        self.resource.writeDeadProperty(davxml.ResourceType.calendar)
-        self.site.resource.putChild("calendar", self.resource)
-        
+        yield super(SharingTests, self).setUp()
+
+        self.resource = (
+            yield self.site.resource.locateChild(self.request, ["calendar"])
+        )[0]
+
         self.resource.validUserIDForShare = self._fakeValidUserID
         self.resource.validUserIDWithCommonNameForShare = self._fakeValidUserID
-        self.resource.sendInvite = lambda record, request:succeed(True)
-        self.resource.removeInvite = lambda record, request:succeed(True)
-        
+        self.resource.sendInvite = lambda record, request: succeed(True)
+        self.resource.removeInvite = lambda record, request: succeed(True)
+
         self.resource.principalForCalendarUserAddress = lambda cuaddr: SharingTests.FakePrincipal(cuaddr)
-        
+
+
     def _fakeValidUserID(self, userid, *args):
         if userid.startswith("/principals/"):
             return userid
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100726/5649e2e5/attachment-0001.html>