assert -> eq_

diff --git a/test/orm/inheritance/test_polymorph2.py b/test/orm/inheritance/test_polymorph2.py
index f231cb7beac52330f0c7c43119be062408812df6..40ec01f176beddc9b335f1a2934325319f5338d1 100644 (file)
--- a/test/orm/inheritance/test_polymorph2.py
+++ b/test/orm/inheritance/test_polymorph2.py
@@ -788,12 +788,12 @@ class GenerativeTest(TestBase, AssertsExecutionResults):
         Query(Person)._adapt_clause(employee_join, False, False)
         
         r = session.query(Person).filter(Person.name.like('%2')).join('status').filter_by(name="active")
-        assert str(list(r)) == "[Manager M2, category YYYYYYYYY, status Status active, Engineer E2, field X, status Status active]"
+        eq_(str(list(r)), "[Manager M2, category YYYYYYYYY, status Status active, Engineer E2, field X, status Status active]")
         r = session.query(Engineer).join('status').filter(Person.name.in_(['E2', 'E3', 'E4', 'M4', 'M2', 'M1']) & (status.c.name=="active")).order_by(Person.name)
-        assert str(list(r)) == "[Engineer E2, field X, status Status active, Engineer E3, field X, status Status active]"
+        eq_(str(list(r)), "[Engineer E2, field X, status Status active, Engineer E3, field X, status Status active]")
 
         r = session.query(Person).filter(exists([1], Car.owner==Person.person_id))
-        assert str(list(r)) == "[Engineer E4, field X, status Status dead]"
+        eq_(str(list(r)), "[Engineer E4, field X, status Status dead]")
 
 class MultiLevelTest(_base.MappedTest):
     @classmethod

diff --git a/test/sql/test_select.py b/test/sql/test_select.py
index a796f2699fdc24b3bf0a9ec587f90f0da6be7345..9acc94eb28179548c8b2727796052d38e885a3fa 100644 (file)
--- a/test/sql/test_select.py
+++ b/test/sql/test_select.py
@@ -1166,11 +1166,11 @@ UNION SELECT mytable.myid FROM mytable"
         params = dict(('in%d' % i, i) for i in range(total_params))
         sql = 'text clause %s' % ', '.join(in_clause)
         t = text(sql)
-        assert len(t.bindparams) == total_params
+        eq_(len(t.bindparams), total_params)
         c = t.compile()
         pp = c.construct_params(params)
-        assert len(set(pp)) == total_params
-        assert len(set(pp.values())) == total_params
+        eq_(len(set(pp)), total_params, '%s %s' % (len(set(pp)), len(pp)))
+        eq_(len(set(pp.values())), total_params)
         
 
     def test_bind_as_col(self):