Integrate REST tests into db framework

Author: schlatterbeck

test/test_rest.py renamed to test/rest_common.py

@@ -15,7 +15,7 @@
 NEEDS_INSTANCE = 1
 
 
-class TestCase(unittest.TestCase):
+class TestCase():
 
     backend = None
 
@@ -510,15 +510,6 @@ def get_obj(path, id):
         'link': path + id
     }
 
-
-def test_suite():
-    suite = unittest.TestSuite()
-    for l in list_backends():
-        dct = dict(backend=l)
-        subcls = type(TestCase)('TestCase_%s' % l, (TestCase,), dct)
-        suite.addTest(unittest.makeSuite(subcls))
-    return suite
-
 if __name__ == '__main__':
     runner = unittest.TextTestRunner()
     unittest.main(testRunner=runner)

test/test_anydbm.py

@@ -20,6 +20,7 @@
 
 from .db_test_base import DBTest, ROTest, SchemaTest, ClassicInitTest, config
 from .db_test_base import HTMLItemTest, SpecialActionTest
+from .rest_common import TestCase as RestTestCase
 
 class anydbmOpener:
     module = get_backend('anydbm')
@@ -56,4 +57,7 @@ class anydbmSpecialActionTestCase(anydbmOpener, SpecialActionTest,
                                   unittest.TestCase):
     backend = 'anydbm'
 
+class anydbmRestTest (RestTestCase, unittest.TestCase):
+    backend = 'anydbm'
+
 # vim: set filetype=python ts=4 sw=4 et si

test/test_mysql.py

@@ -24,6 +24,7 @@
 from .db_test_base import DBTest, ROTest, config, SchemaTest, ClassicInitTest
 from .db_test_base import ConcurrentDBTest, HTMLItemTest, FilterCacheTest
 from .db_test_base import SpecialActionTest
+from .rest_common import TestCase as RestTestCase
 
 
 class mysqlOpener:
@@ -145,4 +146,8 @@ def tearDown(self):
         SpecialActionTest.tearDown(self)
         mysqlOpener.tearDown(self)
 
+@skip_mysql
+class mysqlRestTest (RestTestCase, unittest.TestCase):
+    backend = 'mysql'
+
 # vim: set et sts=4 sw=4 :

test/test_postgresql.py

@@ -24,6 +24,7 @@
 from .db_test_base import DBTest, ROTest, config, SchemaTest, ClassicInitTest
 from .db_test_base import ConcurrentDBTest, HTMLItemTest, FilterCacheTest
 from .db_test_base import ClassicInitBase, setupTracker, SpecialActionTest
+from .rest_common import TestCase as RestTestCase
 
 if not have_backend('postgresql'):
     # FIX: workaround for a bug in pytest.mark.skip():
@@ -225,4 +226,8 @@ def tearDown(self):
         SpecialActionTest.tearDown(self)
         postgresqlOpener.tearDown(self)
 
+@skip_postgresql
+class postgresqlRestTest (RestTestCase, unittest.TestCase):
+    backend = 'postgresql'
+
 # vim: set et sts=4 sw=4 :

test/test_sqlite.py

@@ -21,6 +21,7 @@
 from .db_test_base import DBTest, ROTest, SchemaTest, ClassicInitTest, config
 from .db_test_base import ConcurrentDBTest, FilterCacheTest
 from .db_test_base import SpecialActionTest
+from .rest_common  import TestCase as RestTestCase
 
 class sqliteOpener:
     if have_backend('sqlite'):
@@ -61,3 +62,6 @@ class sqliteSpecialActionTestCase(sqliteOpener, SpecialActionTest,
 from .session_common import SessionTest
 class sqliteSessionTest(sqliteOpener, SessionTest, unittest.TestCase):
     pass
+
+class sqliteRestTest (RestTestCase, unittest.TestCase):
+    backend = 'sqlite'