Silenced deprecation warnings when testing deprecated extensions...

1 files changed, 41 insertions, 26 deletions

diff --git a/test/ext/assignmapper.py b/test/ext/assignmapper.py
index e4c6123fd..fd08d8ea6 100644
--- a/test/ext/assignmapper.py
+++ b/test/ext/assignmapper.py
@@ -1,21 +1,27 @@
 import testbase
-
+import warnings
 from sqlalchemy import *
 from sqlalchemy import exceptions
 from sqlalchemy.orm import create_session, clear_mappers, relation, class_mapper
-from sqlalchemy.ext.assignmapper import assign_mapper
+import sqlalchemy.ext.assignmapper
 from sqlalchemy.ext.sessioncontext import SessionContext
 from testlib import *
 
+def assign_mapper(*args, **kw):
+    try:
+        warnings.filterwarnings('ignore', 'assign_mapper is deprecated')
+        sqlalchemy.ext.assignmapper.assign_mapper(*args, **kw)
+    finally:
+        warnings.filterwarnings('always', 'assign_mapper is deprecated')
 
 class AssignMapperTest(PersistTest):
     def setUpAll(self):
         global metadata, table, table2
         metadata = MetaData(testbase.db)
-        table = Table('sometable', metadata, 
+        table = Table('sometable', metadata,
             Column('id', Integer, primary_key=True),
             Column('data', String(30)))
-        table2 = Table('someothertable', metadata, 
+        table2 = Table('someothertable', metadata,
             Column('id', Integer, primary_key=True),
             Column('someid', None, ForeignKey('sometable.id'))
             )
@@ -25,20 +31,29 @@ class AssignMapperTest(PersistTest):
         global SomeObject, SomeOtherObject, ctx
         class SomeObject(object):pass
         class SomeOtherObject(object):pass
-        
-        ctx = SessionContext(create_session)
-        assign_mapper(ctx, SomeObject, table, properties={
-            'options':relation(SomeOtherObject)
-        })
-        assign_mapper(ctx, SomeOtherObject, table2)
-
-        s = SomeObject()
-        s.id = 1
-        s.data = 'hello'
-        sso = SomeOtherObject()
-        s.options.append(sso)
-        ctx.current.flush()
-        ctx.current.clear()
+
+        deps = ('SessionContext is deprecated',
+                'SessionContextExt is deprecated')
+        try:
+            for dep in deps:
+                warnings.filterwarnings('ignore', dep)
+
+            ctx = SessionContext(create_session)
+            assign_mapper(ctx, SomeObject, table, properties={
+                'options':relation(SomeOtherObject)
+                })
+            assign_mapper(ctx, SomeOtherObject, table2)
+
+            s = SomeObject()
+            s.id = 1
+            s.data = 'hello'
+            sso = SomeOtherObject()
+            s.options.append(sso)
+            ctx.current.flush()
+            ctx.current.clear()
+        finally:
+            for dep in deps:
+                warnings.filterwarnings('always', dep)
 
     def tearDownAll(self):
         metadata.drop_all()
@@ -46,16 +61,16 @@ class AssignMapperTest(PersistTest):
         for table in metadata.table_iterator(reverse=True):
             table.delete().execute()
         clear_mappers()
-        
+
     def test_override_attributes(self):
-        
+
         sso = SomeOtherObject.query().first()
-        
+
         assert SomeObject.query.filter_by(id=1).one().options[0].id == sso.id
 
         s2 = SomeObject(someid=12)
         s3 = SomeOtherObject(someid=123, bogus=345)
-         
+
         class ValidatedOtherObject(object):pass
         assign_mapper(ctx, ValidatedOtherObject, table2, validate=True)
 
@@ -65,16 +80,16 @@ class AssignMapperTest(PersistTest):
             assert False
         except exceptions.ArgumentError:
             pass
-    
+
     def test_dont_clobber_methods(self):
         class MyClass(object):
             def expunge(self):
                 return "an expunge !"
-        
+
         assign_mapper(ctx, MyClass, table2)
-        
+
         assert MyClass().expunge() == "an expunge !"
 
-        
+
 if __name__ == '__main__':
     testbase.main()