[CalendarServer-changes] [10587] CalendarServer/branches/users/glyph/unshare-when-access-revoked

[source_changes at macosforge.org]

Revision: 10587
          http://trac.calendarserver.org//changeset/10587
Author:   glyph at apple.com
Date:     2013-01-28 19:29:13 -0800 (Mon, 28 Jan 2013)
Log Message:
-----------
Document wikiSetup

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/unshare-when-access-revoked/twistedcaldav/test/test_sharing.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/unshare-when-access-revoked/

Modified: CalendarServer/branches/users/glyph/unshare-when-access-revoked/twistedcaldav/test/test_sharing.py
===================================================================
--- CalendarServer/branches/users/glyph/unshare-when-access-revoked/twistedcaldav/test/test_sharing.py	2013-01-29 03:29:12 UTC (rev 10586)
+++ CalendarServer/branches/users/glyph/unshare-when-access-revoked/twistedcaldav/test/test_sharing.py	2013-01-29 03:29:13 UTC (rev 10587)
@@ -677,6 +677,27 @@
 
 
     @inlineCallbacks
+    def wikiSetup(self):
+        """
+        Create a wiki called C{wiki-testing}, and share it with the user whose
+        home is at /.  Return the name of the newly shared calendar in the
+        sharee's home.
+        """
+        wcreate = self.calendarStore.newTransaction("create wiki")
+        yield wcreate.calendarHomeWithUID("wiki-testing", create=True)
+        yield wcreate.commit()
+        self.directoryFixture.addDirectoryService(WikiDirectoryService())
+
+        txn = self.site.resource._associatedTransaction
+        sharee = self.site.resource._newStoreHome
+        sharer = yield txn.calendarHomeWithUID("wiki-testing")
+        cal = yield sharer.calendarWithName("calendar")
+        sharedName = yield cal.shareWith(sharee, BIND_DIRECT)
+        yield self._refreshRoot()
+        returnValue(sharedName)
+
+
+    @inlineCallbacks
     def test_wikiACL(self):
         """
         Ensure shareeAccessControlList( ) honors the access granted by the wiki
@@ -706,22 +727,6 @@
 
 
     @inlineCallbacks
-    def wikiSetup(self):
-        wcreate = self.calendarStore.newTransaction("create wiki")
-        yield wcreate.calendarHomeWithUID("wiki-testing", create=True)
-        yield wcreate.commit()
-        self.directoryFixture.addDirectoryService(WikiDirectoryService())
-
-        txn = self.site.resource._associatedTransaction
-        sharee = self.site.resource._newStoreHome
-        sharer = yield txn.calendarHomeWithUID("wiki-testing")
-        cal = yield sharer.calendarWithName("calendar")
-        sharedName = yield cal.shareWith(sharee, BIND_DIRECT)
-        yield self._refreshRoot()
-        returnValue(sharedName)
-
-
-    @inlineCallbacks
     def test_noWikiAccess(self):
         """
         If L{SharedCollectionMixin.shareeAccessControlList} detects missing
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130128/511405bb/attachment.html>