diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-05-01 10:10:09 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-05-01 10:10:09 -0400 |
| commit | a6825ff019f48b2bdea87942a8ad21e7a0357d95 (patch) | |
| tree | efc396a9c8507c6d521cafa239ba05e54972e50f | |
| parent | be523db4a2409ebf2d2979896f08e8ae77c8ee03 (diff) | |
| parent | 138a8ebfa2dcdc6ded68db6262919cd97a913751 (diff) | |
| download | sqlalchemy-a6825ff019f48b2bdea87942a8ad21e7a0357d95.tar.gz | |
merge default
| -rw-r--r-- | test/ext/test_serializer.py | 3 | ||||
| -rw-r--r-- | test/orm/test_manytomany.py | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/test/ext/test_serializer.py b/test/ext/test_serializer.py index 47edbdaaa..0c7298a8b 100644 --- a/test/ext/test_serializer.py +++ b/test/ext/test_serializer.py @@ -114,6 +114,7 @@ class SerializeTest(fixtures.MappedTest): Address(email='ed@lala.com'), Address(email='ed@bettyboop.com')]) + @testing.skip_if(lambda: util.pypy, "problems with pypy pickle reported") def test_query_two(self): q = \ Session.query(User).join(User.addresses).\ @@ -123,6 +124,7 @@ class SerializeTest(fixtures.MappedTest): eq_(q2.all(), [User(name='fred')]) eq_(list(q2.values(User.id, User.name)), [(9, 'fred')]) + @testing.skip_if(lambda: util.pypy, "problems with pypy pickle reported") def test_query_three(self): ua = aliased(User) q = \ @@ -136,6 +138,7 @@ class SerializeTest(fixtures.MappedTest): ua_2 = q2._entities[0].entity_zero.entity eq_(list(q2.values(ua_2.id, ua_2.name)), [(9, 'fred')]) + @testing.skip_if(lambda: util.pypy, "problems with pypy pickle reported") def test_orm_join(self): from sqlalchemy.orm.util import join diff --git a/test/orm/test_manytomany.py b/test/orm/test_manytomany.py index 313525893..9ac6e033a 100644 --- a/test/orm/test_manytomany.py +++ b/test/orm/test_manytomany.py @@ -233,6 +233,9 @@ class M2MTest(fixtures.MappedTest): p2 = Place('place2') p3 = Place('place3') + sess = Session() + sess.add_all([p3, p1, t1, t2, p2, t3]) + t1.inputs.append(p1) t1.inputs.append(p2) t1.outputs.append(p3) @@ -240,8 +243,6 @@ class M2MTest(fixtures.MappedTest): p2.inputs.append(t2) p3.inputs.append(t2) p1.outputs.append(t1) - sess = Session() - sess.add_all((t1, t2, t3, p1, p2, p3)) sess.commit() self.assert_result([t1], |