--- a/tests/xmlrpc.py	Mon Feb 06 12:32:14 2012 +0100
+++ b/tests/xmlrpc.py	Mon Feb 06 14:39:33 2012 +0100
@@ -1,32 +1,19 @@
 from multiprocessing import Process
-from sqlalchemy import create_engine, pool
 import unittest
 
-from tempfile import mkdtemp
-import shutil
-
 from datetime import datetime
 
 import time
 
 from xmlrpclib import Server as xServer, ServerProxy, Fault
 
-from iro.controller.pool import dbPool
-
-from iro.model.schema import User, Base, Offer, Userright, Job, Message
+from iro.model.schema import User, Offer, Userright, Job, Message
 
 from iro.main import runReactor
 
 import iro.error as IroError
 
-from ngdatabase.mysql import Server, createConfig, Database
-
-from .dbtestcase import DBTestCase
-
-class SampleDatabase(Database):
-    def createPassword(self):
-        self.password="test"
-        return self.password
+from .dbtestcase import DBTestCase, setUpModule, tearDownModule
 
 
 #activates all logging we can get.
@@ -40,9 +27,7 @@
 class XMLRPCTest(DBTestCase):
     """tests for the xmlrpc interface"""
     def setUp(self):
-        if not self.engine:
-            self.engine = md.engine
-        self.s = Process(target=startReactor, args=(md.engine,))
+        self.s = Process(target=startReactor, args=(self.engine,))
         self.s.start()
         #the new process needs time to get stated, so this process has to sleep
         time.sleep(.2)
@@ -247,36 +232,5 @@
     root.putChild('debug', XMLRPCDebug())
     runReactor(reactor, engine, root)
 
-
-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=dbPool.maxthreads, )#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()
-
-    
 if __name__ == '__main__':
         unittest.main()