<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12958] CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/shell/test/test_vfs.py</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12958">12958</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-18 14:24:52 -0700 (Tue, 18 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make UIDsFolderTests todo</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4calendarservertoolsshelltesttest_vfspy">CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/shell/test/test_vfs.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4calendarservertoolsshelltesttest_vfspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/shell/test/test_vfs.py (12957 => 12958)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -18,28 +18,14 @@
</span><span class="cx"> from twisted.trial.unittest import TestCase
</span><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks
</span><span class="cx">
</span><del>-try:
- from twistedcaldav.directory.test.test_xmlfile import XMLFileBase
-except ImportError:
- from twisted.trial.unittest import SkipTest
</del><ins>+# from twext.who.test.test_xml import xmlService
</ins><span class="cx">
</span><del>- class XMLFileBase(object):
- @property
- def service(self):
- # Make this raise SkipTest also
- return XMLFileBase
</del><ins>+# from txdav.common.datastore.test.util import buildStore
</ins><span class="cx">
</span><del>- def __init__(*args, **kwargs):
- raise SkipTest(
- "XMLFileBase is gone; this needs to be reimplemented."
- )
-
-from txdav.common.datastore.test.util import buildStore
-
</del><span class="cx"> from calendarserver.tools.shell.vfs import ListEntry
</span><span class="cx"> from calendarserver.tools.shell.vfs import File, Folder
</span><del>-from calendarserver.tools.shell.vfs import UIDsFolder
-from calendarserver.tools.shell.terminal import ShellService
</del><ins>+# from calendarserver.tools.shell.vfs import UIDsFolder
+# from calendarserver.tools.shell.terminal import ShellService
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -170,36 +156,23 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class DirectoryStubber(XMLFileBase):
- """
- Object which creates a stub L{IDirectoryService}.
- """
- def __init__(self, testCase):
- self.testCase = testCase
-
-
- def mktemp(self):
- return self.testCase.mktemp()
-
-
-
</del><span class="cx"> class UIDsFolderTests(TestCase):
</span><span class="cx"> """
</span><span class="cx"> L{UIDsFolder} contains all principals and is keyed by UID.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- @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, ())
</del><ins>+ # @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, ())
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -233,3 +206,5 @@
</span><span class="cx"> },
</span><span class="cx"> ]
</span><span class="cx"> )
</span><ins>+
+ test_list.todo = "setup() needs to be reimplemented"
</ins></span></pre>
</div>
</div>
</body>
</html>