--- a/tests/db.py	Mon Feb 06 12:32:14 2012 +0100
+++ b/tests/db.py	Mon Feb 06 14:39:33 2012 +0100
@@ -1,56 +1,14 @@
 import unittest
-from sqlalchemy import create_engine, pool
-from tempfile import mkdtemp
-import shutil
 
 from datetime import datetime
 
-from iro.model import POOL_SIZE as DB_POOL_SIZE
-from iro.model.schema import User, Base, Offer, Userright, Job, Message
+from iro.model.schema import User, Offer, Userright, Job, Message
 from decimal import Decimal
 
-from ngdatabase.mysql import Server, createConfig, Database
-from .dbtestcase import DBTestCase
-
-class SampleDatabase(Database):
-    def createPassword(self):
-        self.password="test"
-        return self.password
-
-class ModuleData:
-    def __init__(self):
-        self.tdir = mkdtemp(prefix='iro-mysql-')
-        self.server = Server('%s/my.cnf'%self.tdir)
-        self.db = SampleDatabase("test","test",'%s/my.cnf'%self.tdir)
-        self.engine = create_engine('mysql://test:test@localhost/test?unix_socket=%s/socket'%self.tdir,
-                poolclass = pool.SingletonThreadPool,  pool_size=DB_POOL_SIZE, )#echo=True)
-
-    def setUp(self):
-        with open('%s/my.cnf'%self.tdir,'w') as cnf:
-            cnf.write(createConfig(self.tdir))
-        self.server.create()
-        self.server.start()
-        self.db.create()
-        Base.metadata.create_all(self.engine)
-    
-    def tearDown(self):
-        self.server.stop()
-        shutil.rmtree(self.tdir)
- 
-
-md=ModuleData()
-
-def setUpModule():
-    md.setUp()
-
-def tearDownModule():
-    md.tearDown()
+from .dbtestcase import DBTestCase, setUpModule, tearDownModule
 
 class DBTests(DBTestCase):
     """tests for the db model"""
-    def setUp(self):
-        if not self.engine:
-            self.engine = md.engine
     
     def testRoutes(self):
         '''test routes'''
@@ -84,10 +42,7 @@
 
 class BillTest(DBTestCase):
     """test the bill function"""
-    def setUp(self):
-        if not self.engine:
-            self.engine = md.engine
-
+    
     def testBill(self):
         '''test bill function'''
         apikey='abcdef123456789'
@@ -186,5 +141,6 @@
         
             self.failUnlessEqual(u.rights[1].bill.all(),[(1L,Decimal('0.5000'),'a')])
 
+
 if __name__ == '__main__':
         unittest.main()