Reworked r4042- undeclared deprecation warnings are now *fatal* to tests. No surprises.

1 files changed, 33 insertions, 33 deletions

diff --git a/test/orm/eager_relations.py b/test/orm/eager_relations.py
index bef4ecffc..73d5b11dc 100644
--- a/test/orm/eager_relations.py
+++ b/test/orm/eager_relations.py
@@ -10,7 +10,7 @@ from query import QueryTest
 class EagerTest(FixtureTest):
     keep_mappers = False
     keep_data = True
-    
+
     def test_basic(self):
         mapper(User, users, properties={
             'addresses':relation(mapper(Address, addresses), lazy=False)
@@ -62,15 +62,15 @@ class EagerTest(FixtureTest):
         assert [
             User(id=7, addresses=[
                 Address(id=1)
-            ]), 
+            ]),
             User(id=8, addresses=[
                 Address(id=3, email_address='ed@bettyboop.com'),
                 Address(id=4, email_address='ed@lala.com'),
                 Address(id=2, email_address='ed@wood.com')
-            ]), 
+            ]),
             User(id=9, addresses=[
                 Address(id=5)
-            ]), 
+            ]),
             User(id=10, addresses=[])
         ] == q.all()
 
@@ -140,7 +140,7 @@ class EagerTest(FixtureTest):
         # assert that the eager loader added 'user_id' to the row
         # and deferred loading of that col was disabled
         self.assert_sql_count(testbase.db, go, 0)
-        
+
         # do the mapping in reverse
         # (we would have just used an "addresses" backref but the test fixtures then require the whole
         # backref to be set up, lazy loaders trigger, etc.)
@@ -162,9 +162,9 @@ class EagerTest(FixtureTest):
         # assert that the eager loader didn't have to affect 'user_id' here
         # and that its still deferred
         self.assert_sql_count(testbase.db, go, 1)
-        
+
         clear_mappers()
-        
+
         mapper(User, users, properties={'addresses':relation(Address, lazy=False)})
         mapper(Address, addresses, properties={
             'user_id':deferred(addresses.c.user_id),
@@ -178,7 +178,7 @@ class EagerTest(FixtureTest):
             u = sess.query(User).limit(1).get(8)
             assert User(id=8, addresses=[Address(id=2, dingalings=[Dingaling(id=1)]), Address(id=3), Address(id=4)]) == u
         self.assert_sql_count(testbase.db, go, 1)
-        
+
     def test_many_to_many(self):
 
         mapper(Keyword, keywords)
@@ -425,16 +425,16 @@ class EagerTest(FixtureTest):
             'orders':relation(Order, primaryjoin=sel.c.id==orders.c.user_id, lazy=False)
         })
         mapper(Order, orders)
-        
+
         sess = create_session()
-        self.assertEquals(sess.query(User).first(), 
+        self.assertEquals(sess.query(User).first(),
             User(name=u'jack',orders=[
-                Order(address_id=1,description=u'order 1',isopen=0,user_id=7,id=1), 
-                Order(address_id=1,description=u'order 3',isopen=1,user_id=7,id=3), 
+                Order(address_id=1,description=u'order 1',isopen=0,user_id=7,id=1),
+                Order(address_id=1,description=u'order 3',isopen=1,user_id=7,id=3),
                 Order(address_id=None,description=u'order 5',isopen=0,user_id=7,id=5)],
             email_address=u'jack@bean.com',id=7)
         )
-        
+
     def test_one_to_many_scalar(self):
         mapper(User, users, properties = dict(
             address = relation(mapper(Address, addresses), lazy=False, uselist=False)
@@ -520,7 +520,7 @@ class EagerTest(FixtureTest):
             orders = relation(Order, lazy = False),
         ))
         q = create_session().query(User)
-        l = q.select()
+        l = q.all()
         assert fixtures.user_all_result == q.all()
 
     def test_against_select(self):
@@ -562,47 +562,47 @@ class AddEntityTest(FixtureTest):
     def _assert_result(self):
         return [
             (
-                User(id=7, 
+                User(id=7,
                     addresses=[Address(id=1)]
                 ),
-                Order(id=1, 
+                Order(id=1,
                     items=[Item(id=1), Item(id=2), Item(id=3)]
                 ),
             ),
             (
-                User(id=7, 
+                User(id=7,
                     addresses=[Address(id=1)]
                 ),
-                Order(id=3, 
+                Order(id=3,
                     items=[Item(id=3), Item(id=4), Item(id=5)]
                 ),
             ),
             (
-                User(id=7, 
+                User(id=7,
                     addresses=[Address(id=1)]
                 ),
-                Order(id=5, 
+                Order(id=5,
                     items=[Item(id=5)]
                 ),
             ),
             (
-                 User(id=9, 
+                 User(id=9,
                     addresses=[Address(id=5)]
                 ),
-                 Order(id=2, 
+                 Order(id=2,
                     items=[Item(id=1), Item(id=2), Item(id=3)]
                 ),
              ),
              (
-                  User(id=9, 
+                  User(id=9,
                     addresses=[Address(id=5)]
                 ),
-                  Order(id=4, 
+                  Order(id=4,
                     items=[Item(id=1), Item(id=5)]
                 ),
               )
         ]
-        
+
     def test_basic(self):
         mapper(User, users, properties={
             'addresses':relation(Address, lazy=False),
@@ -686,7 +686,7 @@ class SelfReferentialEagerTest(ORMTest):
             ]) == d
         self.assert_sql_count(testbase.db, go, 1)
 
-    
+
     def test_lazy_fallback_doesnt_affect_eager(self):
         class Node(Base):
             def append(self, node):
@@ -727,7 +727,7 @@ class SelfReferentialEagerTest(ORMTest):
                 Node(data='n123')
             ] == list(n12.children)
         self.assert_sql_count(testbase.db, go, 1)
-        
+
     def test_with_deferred(self):
         class Node(Base):
             def append(self, node):
@@ -748,7 +748,7 @@ class SelfReferentialEagerTest(ORMTest):
         def go():
             assert Node(data='n1', children=[Node(data='n11'), Node(data='n12')]) == sess.query(Node).first()
         self.assert_sql_count(testbase.db, go, 4)
-        
+
         sess.clear()
 
         def go():
@@ -756,13 +756,13 @@ class SelfReferentialEagerTest(ORMTest):
         self.assert_sql_count(testbase.db, go, 3)
 
         sess.clear()
-        
+
         def go():
             assert Node(data='n1', children=[Node(data='n11'), Node(data='n12')]) == sess.query(Node).options(undefer('data'), undefer('children.data')).first()
         self.assert_sql_count(testbase.db, go, 1)
-        
-        
-        
+
+
+
     def test_options(self):
         class Node(Base):
             def append(self, node):
@@ -808,7 +808,7 @@ class SelfReferentialEagerTest(ORMTest):
                     {'nodes_data_1': 'n1'}
                 ),
             ])
-            
+
     @testing.fails_on('maxdb')
     def test_no_depth(self):
         class Node(Base):