<!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>[14214] twext/trunk/twext</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/14214">14214</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-12-10 14:30:11 -0800 (Wed, 10 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix for use with latest Twisted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextenterprisedaltesttest_recordpy">twext/trunk/twext/enterprise/dal/test/test_record.py</a></li>
<li><a href="#twexttrunktwextwhotesttest_directorypy">twext/trunk/twext/who/test/test_directory.py</a></li>
<li><a href="#twexttrunktwextwhotesttest_indexpy">twext/trunk/twext/who/test/test_index.py</a></li>
<li><a href="#twexttrunktwextwhotesttest_xmlpy">twext/trunk/twext/who/test/test_xml.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextenterprisedaltesttest_recordpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/dal/test/test_record.py (14213 => 14214)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/dal/test/test_record.py 2014-12-09 21:20:15 UTC (rev 14213)
+++ twext/trunk/twext/enterprise/dal/test/test_record.py 2014-12-10 22:30:11 UTC (rev 14214)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> """
</span><span class="cx"> txn = self.pool.connection()
</span><span class="cx"> yield txn.execSQL("insert into ALPHA values (:1, :2)", [234, "one"])
</span><del>- self.assertFailure(TestRecord.load(txn, 456), NoSuchRecord)
</del><ins>+ yield self.assertFailure(TestRecord.load(txn, 456), NoSuchRecord)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> txn = self.pool.connection(self.id())
</span><span class="cx"> newRow = yield TestRecord.load(txn, row.beta)
</span><span class="cx"> yield newRow.delete()
</span><del>- self.failUnlessFailure(newRow.delete(), NoSuchRecord)
</del><ins>+ yield self.assertFailure(newRow.delete(), NoSuchRecord)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -183,8 +183,7 @@
</span><span class="cx"> L{TypeError}.
</span><span class="cx"> """
</span><span class="cx"> txn = self.pool.connection()
</span><del>- te = yield self.failUnlessFailure(TestAutoRecord.create(txn),
- TypeError)
</del><ins>+ te = yield self.assertFailure(TestAutoRecord.create(txn), TypeError)
</ins><span class="cx"> self.assertIn("required attribute 'epsilon' not passed", str(te))
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -219,7 +218,7 @@
</span><span class="cx"> don't map to any column), it raises a L{TypeError}.
</span><span class="cx"> """
</span><span class="cx"> txn = self.pool.connection()
</span><del>- te = yield self.failUnlessFailure(
</del><ins>+ te = yield self.assertFailure(
</ins><span class="cx"> TestRecord.create(
</span><span class="cx"> txn, beta=3, gamma=u'three',
</span><span class="cx"> extraBonusAttribute=u'nope',
</span><span class="lines">@@ -395,7 +394,7 @@
</span><span class="cx"> )),
</span><span class="cx"> [tuple([0])]
</span><span class="cx"> )
</span><del>- yield self.failUnlessFailure(TestRecord.pop(txn, 234), NoSuchRecord)
</del><ins>+ yield self.assertFailure(TestRecord.pop(txn, 234), NoSuchRecord)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_columnNamingConvention(self):
</span></span></pre></div>
<a id="twexttrunktwextwhotesttest_directorypy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_directory.py (14213 => 14214)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_directory.py 2014-12-09 21:20:15 UTC (rev 14213)
+++ twext/trunk/twext/who/test/test_directory.py 2014-12-10 22:30:11 UTC (rev 14214)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> expression type fails with L{QueryNotSupportedError}.
</span><span class="cx"> """
</span><span class="cx"> service = self.service()
</span><del>- self.assertFailure(
</del><ins>+ return self.assertFailure(
</ins><span class="cx"> service.recordsFromNonCompoundExpression(object()),
</span><span class="cx"> QueryNotSupportedError
</span><span class="cx"> )
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> }
</span><span class="cx"> )
</span><span class="cx">
</span><del>- self.assertFailure(
</del><ins>+ return self.assertFailure(
</ins><span class="cx"> service.recordsFromNonCompoundExpression(
</span><span class="cx"> object(), records=((wsanchez,))
</span><span class="cx"> ),
</span><span class="lines">@@ -227,8 +227,10 @@
</span><span class="cx"> type fails with L{QueryNotSupportedError}.
</span><span class="cx"> """
</span><span class="cx"> service = self.service()
</span><del>- result = yield(service.recordsFromExpression(object()))
- self.assertFailure(result, QueryNotSupportedError)
</del><ins>+ return self.assertFailure(
+ service.recordsFromExpression(object()),
+ QueryNotSupportedError
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -240,9 +242,9 @@
</span><span class="cx"> service = self.service()
</span><span class="cx">
</span><span class="cx"> for operand in Operand.iterconstants():
</span><del>- result = yield(service.recordsFromExpression(
</del><ins>+ result = yield service.recordsFromExpression(
</ins><span class="cx"> CompoundExpression((), operand)
</span><del>- ))
</del><ins>+ )
</ins><span class="cx"> self.assertEquals(set(result), set(()))
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -424,7 +426,7 @@
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx">
</span><del>- self.assertFailure(results, QueryNotSupportedError)
</del><ins>+ return self.assertFailure(results, QueryNotSupportedError)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -445,7 +447,7 @@
</span><span class="cx"> """
</span><span class="cx"> service = self.service()
</span><span class="cx">
</span><del>- self.assertFailure(
</del><ins>+ return self.assertFailure(
</ins><span class="cx"> service.recordWithUID(u""),
</span><span class="cx"> QueryNotSupportedError
</span><span class="cx"> )
</span><span class="lines">@@ -458,12 +460,13 @@
</span><span class="cx"> """
</span><span class="cx"> service = self.service()
</span><span class="cx">
</span><del>- self.assertFailure(
</del><ins>+ return self.assertFailure(
</ins><span class="cx"> service.recordWithGUID(UUID(int=0)),
</span><span class="cx"> QueryNotSupportedError
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
</ins><span class="cx"> def test_recordsWithRecordType(self):
</span><span class="cx"> """
</span><span class="cx"> L{DirectoryService.recordsWithRecordType} fails with
</span><span class="lines">@@ -472,12 +475,13 @@
</span><span class="cx"> service = self.service()
</span><span class="cx">
</span><span class="cx"> for recordType in RecordType.iterconstants():
</span><del>- self.assertFailure(
</del><ins>+ yield self.assertFailure(
</ins><span class="cx"> service.recordsWithRecordType(recordType),
</span><span class="cx"> QueryNotSupportedError
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
</ins><span class="cx"> def test_recordWithShortName(self):
</span><span class="cx"> """
</span><span class="cx"> L{DirectoryService.recordWithShortName} fails with
</span><span class="lines">@@ -486,7 +490,7 @@
</span><span class="cx"> service = self.service()
</span><span class="cx">
</span><span class="cx"> for recordType in RecordType.iterconstants():
</span><del>- self.assertFailure(
</del><ins>+ yield self.assertFailure(
</ins><span class="cx"> service.recordWithShortName(recordType, u""),
</span><span class="cx"> QueryNotSupportedError
</span><span class="cx"> )
</span><span class="lines">@@ -499,7 +503,7 @@
</span><span class="cx"> """
</span><span class="cx"> service = self.service()
</span><span class="cx">
</span><del>- self.assertFailure(
</del><ins>+ return self.assertFailure(
</ins><span class="cx"> service.recordsWithEmailAddress(u"a@b"),
</span><span class="cx"> QueryNotSupportedError
</span><span class="cx"> )
</span><span class="lines">@@ -511,6 +515,7 @@
</span><span class="cx"> Tests for immutable directory services.
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ @inlineCallbacks
</ins><span class="cx"> def test_updateRecordsNotAllowed(self):
</span><span class="cx"> """
</span><span class="cx"> Updating records is not allowed.
</span><span class="lines">@@ -527,7 +532,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> for create in (True, False):
</span><del>- self.assertFailure(
</del><ins>+ yield self.assertFailure(
</ins><span class="cx"> service.updateRecords((newRecord,), create=create),
</span><span class="cx"> NotAllowedError,
</span><span class="cx"> )
</span><span class="lines">@@ -539,7 +544,7 @@
</span><span class="cx"> """
</span><span class="cx"> service = self.service()
</span><span class="cx">
</span><del>- self.assertFailure(
</del><ins>+ return self.assertFailure(
</ins><span class="cx"> service.removeRecords((u"foo",)),
</span><span class="cx"> NotAllowedError,
</span><span class="cx"> )
</span><span class="lines">@@ -1047,13 +1052,13 @@
</span><span class="cx"> def test_members_group(self):
</span><span class="cx"> staff = self.makeRecord(self.fields_staff)
</span><span class="cx">
</span><del>- self.assertFailure(staff.members(), NotImplementedError)
</del><ins>+ return self.assertFailure(staff.members(), NotImplementedError)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_memberships(self):
</span><span class="cx"> wsanchez = self.makeRecord(self.fields_wsanchez)
</span><span class="cx">
</span><del>- self.assertFailure(wsanchez.groups(), NotImplementedError)
</del><ins>+ return self.assertFailure(wsanchez.groups(), NotImplementedError)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextwhotesttest_indexpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_index.py (14213 => 14214)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_index.py 2014-12-09 21:20:15 UTC (rev 14213)
+++ twext/trunk/twext/who/test/test_index.py 2014-12-10 22:30:11 UTC (rev 14214)
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> MatchType.equals,
</span><span class="cx"> fieldName=BaseFieldName.password
</span><span class="cx"> )
</span><del>- self.assertFailure(result, TypeError)
</del><ins>+ return self.assertFailure(result, TypeError)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_indexedRecordsFromMatchExpression_notMatchExpression(self):
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> ),
</span><span class="cx"> "Not a match type we know about"
</span><span class="cx"> )
</span><del>- self.assertFailure(result, NotImplementedError)
</del><ins>+ return self.assertFailure(result, NotImplementedError)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_indexedRecordsFromMatchExpression_recordTypes(self):
</span><span class="lines">@@ -347,7 +347,7 @@
</span><span class="cx"> ),
</span><span class="cx"> "Not a match type we know about"
</span><span class="cx"> )
</span><del>- self.assertFailure(result, NotImplementedError)
</del><ins>+ return self.assertFailure(result, NotImplementedError)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -420,7 +420,7 @@
</span><span class="cx"> L{QueryNotSupportedError}.
</span><span class="cx"> """
</span><span class="cx"> result = self._test_recordsFromNonCompoundExpression(object())
</span><del>- self.assertFailure(result, QueryNotSupportedError)
</del><ins>+ return self.assertFailure(result, QueryNotSupportedError)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextwhotesttest_xmlpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_xml.py (14213 => 14214)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_xml.py 2014-12-09 21:20:15 UTC (rev 14213)
+++ twext/trunk/twext/who/test/test_xml.py 2014-12-10 22:30:11 UTC (rev 14214)
</span><span class="lines">@@ -672,7 +672,7 @@
</span><span class="cx"> }
</span><span class="cx"> )
</span><span class="cx">
</span><del>- self.assertFailure(
</del><ins>+ return self.assertFailure(
</ins><span class="cx"> service.updateRecords((newRecord,)),
</span><span class="cx"> NoSuchRecordError
</span><span class="cx"> )
</span><span class="lines">@@ -941,7 +941,7 @@
</span><span class="cx"> def test_missingFile(self):
</span><span class="cx"> service = DirectoryService(FilePath(self.mktemp()))
</span><span class="cx">
</span><del>- self.assertFailure(
</del><ins>+ return self.assertFailure(
</ins><span class="cx"> service.recordWithUID(u"missing"),
</span><span class="cx"> DirectoryAvailabilityError
</span><span class="cx"> )
</span></span></pre>
</div>
</div>
</body>
</html>