- add predictable_gc to a few more tests showing up on pypy

diff --git a/test/orm/test_attributes.py b/test/orm/test_attributes.py
index f3a6f7d8ea7cdd68f64a03dfdb6629513bbe8b48..de44e4be39f1e74a3996d618e873387de2905b54 100644 (file)
--- a/test/orm/test_attributes.py
+++ b/test/orm/test_attributes.py
@@ -294,6 +294,7 @@ class AttributesTest(fixtures.ORMTest):
         assert state.obj() is None
         assert state.dict == {}
 
+    @testing.requires.predictable_gc
     def test_object_dereferenced_error(self):
         class Foo(object):
             pass
@@ -317,7 +318,8 @@ class AttributesTest(fixtures.ORMTest):
         )
 
     def test_deferred(self):
-        class Foo(object):pass
+        class Foo(object):
+            pass
 
         data = {'a':'this is a', 'b':12}
         def loader(state, keys):

diff --git a/test/orm/test_expire.py b/test/orm/test_expire.py
index 6eb124cd288f0715393afbfd483485f8d5154838..0ee677157ad0fe984fc55776bd204ef04dc93d28 100644 (file)
--- a/test/orm/test_expire.py
+++ b/test/orm/test_expire.py
@@ -850,11 +850,11 @@ class ExpireTest(_fixtures.FixtureTest):
         assert len(u.addresses) == 3
         sess.expire(u)
         assert 'addresses' not in u.__dict__
-        print("-------------------------------------------")
         sess.query(User).filter_by(id=8).all()
         assert 'addresses' in u.__dict__
         assert len(u.addresses) == 3
 
+    @testing.requires.predictable_gc
     def test_expire_all(self):
         users, Address, addresses, User = (self.tables.users,
                                 self.classes.Address,
@@ -869,16 +869,16 @@ class ExpireTest(_fixtures.FixtureTest):
 
         sess = create_session()
         userlist = sess.query(User).order_by(User.id).all()
-        assert self.static.user_address_result == userlist
-        assert len(list(sess)) == 9
+        eq_(self.static.user_address_result, userlist)
+        eq_(len(list(sess)), 9)
         sess.expire_all()
         gc_collect()
-        assert len(list(sess)) == 4 # since addresses were gc'ed
+        eq_(len(list(sess)), 4) # since addresses were gc'ed
 
         userlist = sess.query(User).order_by(User.id).all()
         u = userlist[1]
         eq_(self.static.user_address_result, userlist)
-        assert len(list(sess)) == 9
+        eq_(len(list(sess)), 9)
 
     def test_state_change_col_to_deferred(self):
         """Behavioral test to verify the current activity of loader callables."""