summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2015-10-19 18:48:58 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2015-10-19 18:48:58 -0400
commit5bc5adb6270bd5c7ef0564973cbd765aa371fbca (patch)
treece0ccb9b837d67316f17bebdb6b73e5bcd630237
parent8e9a81a19e9ba0502067665f3d2729bcd6b9447e (diff)
downloadsqlalchemy-5bc5adb6270bd5c7ef0564973cbd765aa371fbca.tar.gz
- use is_() here to more clearly show what's going wrong
on occasional pypy test runs
-rw-r--r--test/orm/inheritance/test_poly_persistence.py38
1 files changed, 25 insertions, 13 deletions
diff --git a/test/orm/inheritance/test_poly_persistence.py b/test/orm/inheritance/test_poly_persistence.py
index c6a54c0b5..361377de8 100644
--- a/test/orm/inheritance/test_poly_persistence.py
+++ b/test/orm/inheritance/test_poly_persistence.py
@@ -1,6 +1,6 @@
"""tests basic polymorphic mapper loading/saving, minimal relationships"""
-from sqlalchemy.testing import eq_, assert_raises, assert_raises_message
+from sqlalchemy.testing import eq_, is_, assert_raises, assert_raises_message
from sqlalchemy import *
from sqlalchemy.orm import *
from sqlalchemy.orm import exc as orm_exc
@@ -271,18 +271,30 @@ def _generate_round_trip_test(include_base, lazy_relationship,
# into the "person_join" conversion.
palias = people.alias("palias")
dilbert = session.query(Person).get(dilbert.person_id)
- assert dilbert is session.query(Person).filter(
- (palias.c.name=='dilbert') & \
- (palias.c.person_id==Person.person_id)).first()
- assert dilbert is session.query(Engineer).filter(
- (palias.c.name=='dilbert') & \
- (palias.c.person_id==Person.person_id)).first()
- assert dilbert is session.query(Person).filter(
- (Engineer.engineer_name=="engineer1") & \
- (engineers.c.person_id==people.c.person_id)
- ).first()
- assert dilbert is session.query(Engineer).\
- filter(Engineer.engineer_name=="engineer1")[0]
+ is_(
+ dilbert,
+ session.query(Person).filter(
+ (palias.c.name == 'dilbert') &
+ (palias.c.person_id == Person.person_id)).first()
+ )
+ is_(
+ dilbert,
+ session.query(Engineer).filter(
+ (palias.c.name == 'dilbert') &
+ (palias.c.person_id == Person.person_id)).first()
+ )
+ is_(
+ dilbert,
+ session.query(Person).filter(
+ (Engineer.engineer_name == "engineer1") &
+ (engineers.c.person_id == people.c.person_id)
+ ).first()
+ )
+ is_(
+ dilbert,
+ session.query(Engineer).
+ filter(Engineer.engineer_name == "engineer1")[0]
+ )
session.flush()
session.expunge_all()