From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 16 Mar 2011 01:26:59 +0000 (-0400)
Subject: change TypeError test to not care about string message
X-Git-Tag: rel_0_7b3~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32e80d6cc5d783f8528105196e200a50864ab0a1;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

change TypeError test to not care about string message
---

diff --git a/test/orm/test_dynamic.py b/test/orm/test_dynamic.py
index 409615c399..5ce36ec8a4 100644
--- a/test/orm/test_dynamic.py
+++ b/test/orm/test_dynamic.py
@@ -6,7 +6,7 @@ from sqlalchemy import Integer, String, ForeignKey, desc, select, func
 from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, create_session, Query, attributes
 from sqlalchemy.orm.dynamic import AppenderMixin
-from test.lib.testing import eq_, AssertsCompiledSQL, assert_raises_message
+from test.lib.testing import eq_, AssertsCompiledSQL, assert_raises_message, assert_raises
 from test.orm import _base, _fixtures
 
 
@@ -503,11 +503,12 @@ class SessionTest(_fixtures.FixtureTest):
 
         eq_(Address(email_address='c'), u.addresses[2])
 
-        try:
+        def go():
             del u.addresses[3]
-            assert False
-        except TypeError, e:
-            assert "doesn't support item deletion" in str(e), str(e)
+        assert_raises(
+            TypeError,
+            go
+        )
 
         for a in u.addresses.filter(Address.email_address.in_(['c', 'e', 'f'])):
             u.addresses.remove(a)