Fix testing. Really.

diff --git a/test/testlib/testing.py b/test/testlib/testing.py
index 9b92f46d5c0acf3164bf1ead6ab16119e49b58b7..fda85e2808026f2af3cf2bfb759e74c5a6994b2f 100644 (file)
--- a/test/testlib/testing.py
+++ b/test/testlib/testing.py
@@ -6,7 +6,7 @@ import testbase
 import unittest, re, sys, os
 from cStringIO import StringIO
 import testlib.config as config
-sql, Metadata, clear_mappers = None, None, None
+sql, MetaData, clear_mappers = None, None, None
 
 
 __all__ = 'PersistTest', 'AssertMixin', 'ORMTest'
@@ -253,10 +253,15 @@ class ORMTest(AssertMixin):
         return _otest_metadata
 
     def tearDownAll(self):
+        global clear_mappers
+        if clear_mappers is None:
+            from sqlalchemy.orm import clear_mappers
+
         clear_mappers()
         _otest_metadata.drop_all()
 
     def tearDown(self):
+        global clear_mappers
         if clear_mappers is None:
             from sqlalchemy.orm import clear_mappers