fix doctest integration

2 files changed, 7 insertions, 25 deletions

diff --git a/test/ext/alltests.py b/test/ext/alltests.py
index 67513f032..ee6ece89c 100644
--- a/test/ext/alltests.py
+++ b/test/ext/alltests.py
@@ -1,17 +1,18 @@
 import testbase
-import unittest
+import unittest, doctest
 
 def suite():
-    modules_to_test = (
-	'ext.activemapper',
-	'ext.sqlsoup'
-        )
+    unittest_modules = ['ext.activemapper']
+    doctest_modules = ['sqlalchemy.ext.sqlsoup']
+
     alltests = unittest.TestSuite()
-    for name in modules_to_test:
+    for name in unittest_modules:
         mod = __import__(name)
         for token in name.split('.')[1:]:
             mod = getattr(mod, token)
         alltests.addTest(unittest.findTestCases(mod, suiteClass=None))
+    for name in doctest_modules:
+        alltests.addTest(doctest.DocTestSuite(name))
     return alltests
 
 
diff --git a/test/ext/sqlsoup.py b/test/ext/sqlsoup.py
deleted file mode 100644
index 4d4dbb69a..000000000
--- a/test/ext/sqlsoup.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import testbase
-
-import sqlalchemy.ext.sqlsoup as sqlsoup
-
-class SqlSoupTest(testbase.AssertMixin):
-    def tearDown(self):
-        pass
-    def tearDownAll(self):
-        pass
-    def setUpAll(self):
-        pass
-    def setUp(self):
-        pass
-    def testall(self):
-        import doctest
-        doctest.testmod(m=sqlsoup,verbose=True)
-        
-if __name__ == "__main__":
-    testbase.main()