222: Fixed broken assertion in IPATypeError; did more work on docstrings in same

1 files changed, 12 insertions, 7 deletions

diff --git a/ipalib/tests/test_errors.py b/ipalib/tests/test_errors.py
index bca8d3a8..48b1b8fe 100644
--- a/ipalib/tests/test_errors.py
+++ b/ipalib/tests/test_errors.py
@@ -21,7 +21,7 @@
 Unit tests for `ipalib.errors` module.
 """
 
-from tstutil import raises, getitem, no_set, no_del, read_only, ClassChecker
+from tstutil import raises, ClassChecker
 from ipalib import errors
 
 
@@ -38,9 +38,14 @@ class test_IPATypeError(ClassChecker):
         """
         Tests the `errors.IPATypeError.__init__` method.
         """
-        t = unicode
-        v = 'hello'
-        e = self.cls(t, v)
-        assert e.type is t
-        assert e.value is v
-        assert str(e) == 'need a %r; got %r' % (t, v)
+        type_ = unicode
+        okay = 'hello'
+        e = self.cls(type_, okay)
+        assert e.type is type_
+        assert e.value is okay
+        assert str(e) == 'need a %r; got %r' % (type_, okay)
+
+        # Check that AssertionError is raised when type(value) is type_:
+        fail = u'hello'
+        e = raises(AssertionError, self.cls, type_, fail)
+        assert str(e) == '%r is a %r' % (fail, type_)