[CalendarServer-changes] [14214] twext/trunk/twext
source_changes at macosforge.org
source_changes at macosforge.org
Wed Dec 10 14:30:11 PST 2014
Revision: 14214
http://trac.calendarserver.org//changeset/14214
Author: cdaboo at apple.com
Date: 2014-12-10 14:30:11 -0800 (Wed, 10 Dec 2014)
Log Message:
-----------
Fix for use with latest Twisted.
Modified Paths:
--------------
twext/trunk/twext/enterprise/dal/test/test_record.py
twext/trunk/twext/who/test/test_directory.py
twext/trunk/twext/who/test/test_index.py
twext/trunk/twext/who/test/test_xml.py
Modified: twext/trunk/twext/enterprise/dal/test/test_record.py
===================================================================
--- 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)
@@ -112,7 +112,7 @@
"""
txn = self.pool.connection()
yield txn.execSQL("insert into ALPHA values (:1, :2)", [234, "one"])
- self.assertFailure(TestRecord.load(txn, 456), NoSuchRecord)
+ yield self.assertFailure(TestRecord.load(txn, 456), NoSuchRecord)
@inlineCallbacks
@@ -173,7 +173,7 @@
txn = self.pool.connection(self.id())
newRow = yield TestRecord.load(txn, row.beta)
yield newRow.delete()
- self.failUnlessFailure(newRow.delete(), NoSuchRecord)
+ yield self.assertFailure(newRow.delete(), NoSuchRecord)
@inlineCallbacks
@@ -183,8 +183,7 @@
L{TypeError}.
"""
txn = self.pool.connection()
- te = yield self.failUnlessFailure(TestAutoRecord.create(txn),
- TypeError)
+ te = yield self.assertFailure(TestAutoRecord.create(txn), TypeError)
self.assertIn("required attribute 'epsilon' not passed", str(te))
@@ -219,7 +218,7 @@
don't map to any column), it raises a L{TypeError}.
"""
txn = self.pool.connection()
- te = yield self.failUnlessFailure(
+ te = yield self.assertFailure(
TestRecord.create(
txn, beta=3, gamma=u'three',
extraBonusAttribute=u'nope',
@@ -395,7 +394,7 @@
)),
[tuple([0])]
)
- yield self.failUnlessFailure(TestRecord.pop(txn, 234), NoSuchRecord)
+ yield self.assertFailure(TestRecord.pop(txn, 234), NoSuchRecord)
def test_columnNamingConvention(self):
Modified: twext/trunk/twext/who/test/test_directory.py
===================================================================
--- 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)
@@ -175,7 +175,7 @@
expression type fails with L{QueryNotSupportedError}.
"""
service = self.service()
- self.assertFailure(
+ return self.assertFailure(
service.recordsFromNonCompoundExpression(object()),
QueryNotSupportedError
)
@@ -213,7 +213,7 @@
}
)
- self.assertFailure(
+ return self.assertFailure(
service.recordsFromNonCompoundExpression(
object(), records=((wsanchez,))
),
@@ -227,8 +227,10 @@
type fails with L{QueryNotSupportedError}.
"""
service = self.service()
- result = yield(service.recordsFromExpression(object()))
- self.assertFailure(result, QueryNotSupportedError)
+ return self.assertFailure(
+ service.recordsFromExpression(object()),
+ QueryNotSupportedError
+ )
@inlineCallbacks
@@ -240,9 +242,9 @@
service = self.service()
for operand in Operand.iterconstants():
- result = yield(service.recordsFromExpression(
+ result = yield service.recordsFromExpression(
CompoundExpression((), operand)
- ))
+ )
self.assertEquals(set(result), set(()))
@@ -424,7 +426,7 @@
)
)
- self.assertFailure(results, QueryNotSupportedError)
+ return self.assertFailure(results, QueryNotSupportedError)
@@ -445,7 +447,7 @@
"""
service = self.service()
- self.assertFailure(
+ return self.assertFailure(
service.recordWithUID(u""),
QueryNotSupportedError
)
@@ -458,12 +460,13 @@
"""
service = self.service()
- self.assertFailure(
+ return self.assertFailure(
service.recordWithGUID(UUID(int=0)),
QueryNotSupportedError
)
+ @inlineCallbacks
def test_recordsWithRecordType(self):
"""
L{DirectoryService.recordsWithRecordType} fails with
@@ -472,12 +475,13 @@
service = self.service()
for recordType in RecordType.iterconstants():
- self.assertFailure(
+ yield self.assertFailure(
service.recordsWithRecordType(recordType),
QueryNotSupportedError
)
+ @inlineCallbacks
def test_recordWithShortName(self):
"""
L{DirectoryService.recordWithShortName} fails with
@@ -486,7 +490,7 @@
service = self.service()
for recordType in RecordType.iterconstants():
- self.assertFailure(
+ yield self.assertFailure(
service.recordWithShortName(recordType, u""),
QueryNotSupportedError
)
@@ -499,7 +503,7 @@
"""
service = self.service()
- self.assertFailure(
+ return self.assertFailure(
service.recordsWithEmailAddress(u"a at b"),
QueryNotSupportedError
)
@@ -511,6 +515,7 @@
Tests for immutable directory services.
"""
+ @inlineCallbacks
def test_updateRecordsNotAllowed(self):
"""
Updating records is not allowed.
@@ -527,7 +532,7 @@
)
for create in (True, False):
- self.assertFailure(
+ yield self.assertFailure(
service.updateRecords((newRecord,), create=create),
NotAllowedError,
)
@@ -539,7 +544,7 @@
"""
service = self.service()
- self.assertFailure(
+ return self.assertFailure(
service.removeRecords((u"foo",)),
NotAllowedError,
)
@@ -1047,13 +1052,13 @@
def test_members_group(self):
staff = self.makeRecord(self.fields_staff)
- self.assertFailure(staff.members(), NotImplementedError)
+ return self.assertFailure(staff.members(), NotImplementedError)
def test_memberships(self):
wsanchez = self.makeRecord(self.fields_wsanchez)
- self.assertFailure(wsanchez.groups(), NotImplementedError)
+ return self.assertFailure(wsanchez.groups(), NotImplementedError)
Modified: twext/trunk/twext/who/test/test_index.py
===================================================================
--- 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)
@@ -225,7 +225,7 @@
MatchType.equals,
fieldName=BaseFieldName.password
)
- self.assertFailure(result, TypeError)
+ return self.assertFailure(result, TypeError)
def test_indexedRecordsFromMatchExpression_notMatchExpression(self):
@@ -239,7 +239,7 @@
),
"Not a match type we know about"
)
- self.assertFailure(result, NotImplementedError)
+ return self.assertFailure(result, NotImplementedError)
def test_indexedRecordsFromMatchExpression_recordTypes(self):
@@ -347,7 +347,7 @@
),
"Not a match type we know about"
)
- self.assertFailure(result, NotImplementedError)
+ return self.assertFailure(result, NotImplementedError)
@inlineCallbacks
@@ -420,7 +420,7 @@
L{QueryNotSupportedError}.
"""
result = self._test_recordsFromNonCompoundExpression(object())
- self.assertFailure(result, QueryNotSupportedError)
+ return self.assertFailure(result, QueryNotSupportedError)
Modified: twext/trunk/twext/who/test/test_xml.py
===================================================================
--- 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)
@@ -672,7 +672,7 @@
}
)
- self.assertFailure(
+ return self.assertFailure(
service.updateRecords((newRecord,)),
NoSuchRecordError
)
@@ -941,7 +941,7 @@
def test_missingFile(self):
service = DirectoryService(FilePath(self.mktemp()))
- self.assertFailure(
+ return self.assertFailure(
service.recordWithUID(u"missing"),
DirectoryAvailabilityError
)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20141210/de7a7e08/attachment-0001.html>
More information about the calendarserver-changes
mailing list