- Reworked test/orm/mapper

- Exposed some uncovered (and broken) functionality
- Fixed [ticket:1038]

1 files changed, 2 insertions, 2 deletions

diff --git a/test/testlib/testing.py b/test/testlib/testing.py
index e1f8e4350..da3e81d62 100644
--- a/test/testlib/testing.py
+++ b/test/testlib/testing.py
@@ -629,9 +629,9 @@ class TestBase(unittest.TestCase):
     def assertRaisesMessage(self, except_cls, msg, callable_, *args, **kwargs):
         try:
             callable_(*args, **kwargs)
-            assert False, "Callable did not raise expected exception"
+            assert False, "Callable did not raise an exception"
         except except_cls, e:
-            assert re.search(msg, str(e)), "Exception message did not match: '%s'" % str(e)
+            assert re.search(msg, str(e)), "%r !~ %s" % (msg, e)
 
     if not hasattr(unittest.TestCase, 'assertTrue'):
         assertTrue = unittest.TestCase.failUnless