[CalendarServer-changes] [12958] CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools /shell/test/test_vfs.py
source_changes at macosforge.org
source_changes at macosforge.org
Tue Mar 18 14:24:53 PDT 2014
Revision: 12958
http://trac.calendarserver.org//changeset/12958
Author: wsanchez at apple.com
Date: 2014-03-18 14:24:52 -0700 (Tue, 18 Mar 2014)
Log Message:
-----------
Make UIDsFolderTests todo
Modified Paths:
--------------
CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/shell/test/test_vfs.py
Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/shell/test/test_vfs.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/shell/test/test_vfs.py 2014-03-18 20:56:02 UTC (rev 12957)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/shell/test/test_vfs.py 2014-03-18 21:24:52 UTC (rev 12958)
@@ -18,28 +18,14 @@
from twisted.trial.unittest import TestCase
from twisted.internet.defer import succeed, inlineCallbacks
-try:
- from twistedcaldav.directory.test.test_xmlfile import XMLFileBase
-except ImportError:
- from twisted.trial.unittest import SkipTest
+# from twext.who.test.test_xml import xmlService
- class XMLFileBase(object):
- @property
- def service(self):
- # Make this raise SkipTest also
- return XMLFileBase
+# from txdav.common.datastore.test.util import buildStore
- def __init__(*args, **kwargs):
- raise SkipTest(
- "XMLFileBase is gone; this needs to be reimplemented."
- )
-
-from txdav.common.datastore.test.util import buildStore
-
from calendarserver.tools.shell.vfs import ListEntry
from calendarserver.tools.shell.vfs import File, Folder
-from calendarserver.tools.shell.vfs import UIDsFolder
-from calendarserver.tools.shell.terminal import ShellService
+# from calendarserver.tools.shell.vfs import UIDsFolder
+# from calendarserver.tools.shell.terminal import ShellService
@@ -170,36 +156,23 @@
-class DirectoryStubber(XMLFileBase):
- """
- Object which creates a stub L{IDirectoryService}.
- """
- def __init__(self, testCase):
- self.testCase = testCase
-
-
- def mktemp(self):
- return self.testCase.mktemp()
-
-
-
class UIDsFolderTests(TestCase):
"""
L{UIDsFolder} contains all principals and is keyed by UID.
"""
- @inlineCallbacks
- def setUp(self):
- """
- Create a L{UIDsFolder}.
- """
- directory = DirectoryStubber(self).service()
- self.svc = ShellService(
- store=(yield buildStore(self, None, directoryService=directory)),
- directory=directory,
- options=None, reactor=None, config=None
- )
- self.folder = UIDsFolder(self.svc, ())
+ # @inlineCallbacks
+ # def setUp(self):
+ # """
+ # Create a L{UIDsFolder}.
+ # """
+ # directory = xmlService(self.mktemp())
+ # self.svc = ShellService(
+ # store=(yield buildStore(self, None, directoryService=directory)),
+ # directory=directory,
+ # options=None, reactor=None, config=None
+ # )
+ # self.folder = UIDsFolder(self.svc, ())
@inlineCallbacks
@@ -233,3 +206,5 @@
},
]
)
+
+ test_list.todo = "setup() needs to be reimplemented"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140318/4f723d15/attachment.html>
More information about the calendarserver-changes
mailing list