From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 1 May 2013 14:09:34 +0000 (-0400)
Subject: - disable tests failing with pypy2, [ticket:2719]
X-Git-Tag: rel_0_8_2~78^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=138a8ebfa2dcdc6ded68db6262919cd97a913751;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- disable tests failing with pypy2, [ticket:2719]
---

diff --git a/test/ext/test_serializer.py b/test/ext/test_serializer.py
index 8d4394e2d4..74e033b4f5 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, u'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, u'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 3135258930..9ac6e033a6 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],