From 4d5a0b5e12a77672e89f849cc5a708d73734b10f Mon Sep 17 00:00:00 2001 From: Philip Jenvey Date: Sun, 19 Jul 2009 07:03:16 +0000 Subject: [PATCH] assert -> eq_ --- test/orm/inheritance/test_polymorph2.py | 6 +++--- test/sql/test_select.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/orm/inheritance/test_polymorph2.py b/test/orm/inheritance/test_polymorph2.py index f231cb7bea..40ec01f176 100644 --- 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 a796f2699f..9acc94eb28 100644 --- 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): -- 2.47.3