<!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>[13420] twext/trunk/twext/who</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/13420">13420</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-05-02 19:31:24 -0700 (Fri, 02 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>raise DirectoryAvailabilityError() if the XML file is missing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhotesttest_xmlpy">twext/trunk/twext/who/test/test_xml.py</a></li>
<li><a href="#twexttrunktwextwhoxmlpy">twext/trunk/twext/who/xml.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwhotesttest_xmlpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_xml.py (13419 => 13420)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_xml.py 2014-05-03 02:17:35 UTC (rev 13419)
+++ twext/trunk/twext/who/test/test_xml.py 2014-05-03 02:31:24 UTC (rev 13420)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> from twisted.python.filepath import FilePath
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx">
</span><del>-from ..idirectory import NoSuchRecordError
</del><ins>+from ..idirectory import DirectoryAvailabilityError, NoSuchRecordError
</ins><span class="cx"> from ..expression import (
</span><span class="cx"> CompoundExpression, Operand,
</span><span class="cx"> MatchExpression, MatchType, MatchFlags
</span><span class="lines">@@ -888,26 +888,19 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class MissingFileTest(unittest.TestCase):
</span><span class="cx">
</span><del>- @inlineCallbacks
</del><span class="cx"> def test_missingFile(self):
</span><span class="cx"> service = DirectoryService(FilePath(self.mktemp()))
</span><del>- record = yield service.recordWithUID(u"missing")
- self.assertEquals(record, None)
</del><span class="cx">
</span><del>- fields = {
- service.fieldName.uid: u"notmissing",
- service.fieldName.recordType: service.recordType.user,
- }
</del><ins>+ self.assertFailure(
+ service.recordWithUID(u"missing"),
+ DirectoryAvailabilityError
+ )
</ins><span class="cx">
</span><del>- updatedRecord = DirectoryRecord(service, fields)
- yield service.updateRecords((updatedRecord,))
- record = yield service.recordWithUID(u"notmissing")
- self.assertEquals(record.uid, u"notmissing")
</del><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> class QueryMixIn(object):
</span><span class="cx"> def query(
</span><span class="cx"> self,
</span></span></pre></div>
<a id="twexttrunktwextwhoxmlpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/xml.py (13419 => 13420)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/xml.py 2014-05-03 02:17:35 UTC (rev 13419)
+++ twext/trunk/twext/who/xml.py 2014-05-03 02:31:24 UTC (rev 13420)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> from twisted.internet.defer import fail
</span><span class="cx">
</span><span class="cx"> from .idirectory import (
</span><del>- DirectoryServiceError,
</del><ins>+ DirectoryServiceError, DirectoryAvailabilityError,
</ins><span class="cx"> NoSuchRecordError, UnknownRecordTypeError,
</span><span class="cx"> RecordType as BaseRecordType, FieldName as BaseFieldName,
</span><span class="cx"> )
</span><span class="lines">@@ -211,8 +211,7 @@
</span><span class="cx"> Does nothing if a successful refresh has happened within the
</span><span class="cx"> last L{self.refreshInterval} seconds.
</span><span class="cx">
</span><del>- @param loadNow: If true, load now (ignoring
- L{self.refreshInterval})
</del><ins>+ @param loadNow: If true, load now (ignoring L{self.refreshInterval})
</ins><span class="cx"> @type loadNow: L{type}
</span><span class="cx">
</span><span class="cx"> @param stat: If true, check file metadata and don't reload if
</span><span class="lines">@@ -235,7 +234,9 @@
</span><span class="cx"> except (OSError, IOError):
</span><span class="cx"> # Can't read the file
</span><span class="cx"> self.flush()
</span><del>- return
</del><ins>+ raise DirectoryAvailabilityError(
+ "Can't open {}".format(self.filePath)
+ )
</ins><span class="cx">
</span><span class="cx"> cacheTag = (
</span><span class="cx"> self.filePath.getModificationTime(),
</span><span class="lines">@@ -258,7 +259,9 @@
</span><span class="cx"> except (OSError, IOError):
</span><span class="cx"> # Can't read the file
</span><span class="cx"> self.flush()
</span><del>- return
</del><ins>+ raise DirectoryAvailabilityError(
+ "Can't open {}".format(self.filePath)
+ )
</ins><span class="cx">
</span><span class="cx"> #
</span><span class="cx"> # Pull data from DOM
</span><span class="lines">@@ -545,7 +548,7 @@
</span><span class="cx"> Drop cached data and load the XML DOM.
</span><span class="cx"> """
</span><span class="cx"> self.flush()
</span><del>- etree = self.loadRecords(loadNow=True)
</del><ins>+ etree = self.loadRecords(loadNow=True, stat=False)
</ins><span class="cx"> return etree.getroot()
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>