[CalendarServer-changes] [12275] twext/trunk/twext/who/test/test_directory.py

source_changes at macosforge.org source_changes at macosforge.org
Wed Mar 12 11:23:23 PDT 2014


Revision: 12275
          http://trac.calendarserver.org//changeset/12275
Author:   wsanchez at apple.com
Date:     2014-01-08 19:29:50 -0800 (Wed, 08 Jan 2014)
Log Message:
-----------
Invalid directory records now raise InvalidDirectoryRecordError.

Modified Paths:
--------------
    twext/trunk/twext/who/test/test_directory.py

Modified: twext/trunk/twext/who/test/test_directory.py
===================================================================
--- twext/trunk/twext/who/test/test_directory.py	2014-01-08 23:27:54 UTC (rev 12274)
+++ twext/trunk/twext/who/test/test_directory.py	2014-01-09 03:29:50 UTC (rev 12275)
@@ -17,6 +17,7 @@
 """
 Generic directory service base implementation tests.
 """
+from __future__ import print_function
 
 from uuid import UUID
 from textwrap import dedent
@@ -29,6 +30,7 @@
 from twisted.internet.defer import succeed
 
 from ..idirectory import (
+    InvalidDirectoryRecordError,
     QueryNotSupportedError, NotAllowedError,
     RecordType, FieldName,
     IDirectoryService, IDirectoryRecord,
@@ -638,11 +640,11 @@
         """
         fields = self.fields_wsanchez.copy()
         del fields[FieldName.uid]
-        self.assertRaises(ValueError, self.makeRecord, fields)
+        self.assertRaises(InvalidDirectoryRecordError, self.makeRecord, fields)
 
         fields = self.fields_wsanchez.copy()
         fields[FieldName.uid] = u""
-        self.assertRaises(ValueError, self.makeRecord, fields)
+        self.assertRaises(InvalidDirectoryRecordError, self.makeRecord, fields)
 
 
     def test_initWithNoRecordType(self):
@@ -651,11 +653,11 @@
         """
         fields = self.fields_wsanchez.copy()
         del fields[FieldName.recordType]
-        self.assertRaises(ValueError, self.makeRecord, fields)
+        self.assertRaises(InvalidDirectoryRecordError, self.makeRecord, fields)
 
         fields = self.fields_wsanchez.copy()
         fields[FieldName.recordType] = None
-        self.assertRaises(ValueError, self.makeRecord, fields)
+        self.assertRaises(InvalidDirectoryRecordError, self.makeRecord, fields)
 
 
     def test_initWithBogusRecordType(self):
@@ -664,7 +666,7 @@
         """
         fields = self.fields_wsanchez.copy()
         fields[FieldName.recordType] = object()
-        self.assertRaises(ValueError, self.makeRecord, fields)
+        self.assertRaises(InvalidDirectoryRecordError, self.makeRecord, fields)
 
 
     def test_initWithNoShortNames(self):
@@ -673,19 +675,19 @@
         """
         fields = self.fields_wsanchez.copy()
         del fields[FieldName.shortNames]
-        self.assertRaises(ValueError, self.makeRecord, fields)
+        self.assertRaises(InvalidDirectoryRecordError, self.makeRecord, fields)
 
         fields = self.fields_wsanchez.copy()
         fields[FieldName.shortNames] = ()
-        self.assertRaises(ValueError, self.makeRecord, fields)
+        self.assertRaises(InvalidDirectoryRecordError, self.makeRecord, fields)
 
         fields = self.fields_wsanchez.copy()
         fields[FieldName.shortNames] = (u"",)
-        self.assertRaises(ValueError, self.makeRecord, fields)
+        self.assertRaises(InvalidDirectoryRecordError, self.makeRecord, fields)
 
         fields = self.fields_wsanchez.copy()
         fields[FieldName.shortNames] = (u"wsanchez", u"")
-        self.assertRaises(ValueError, self.makeRecord, fields)
+        self.assertRaises(InvalidDirectoryRecordError, self.makeRecord, fields)
 
 
     def test_initNormalizeEmailLowercase(self):
@@ -705,7 +707,7 @@
         Raise L{TypeError} if fields are of the wrong type.
         """
         self.assertRaises(
-            TypeError,
+            InvalidDirectoryRecordError,
             self.makeRecord,
             {
                 FieldName.uid: "UID:wsanchez",  # Not unicode.
@@ -715,7 +717,7 @@
         )
 
         self.assertRaises(
-            TypeError,
+            InvalidDirectoryRecordError,
             self.makeRecord,
             {
                 FieldName.uid: u"UID:wsanchez",
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/5bf9a3bb/attachment.html>


More information about the calendarserver-changes mailing list