--- a/tests/xmlrpc.py	Sun Jan 22 12:26:00 2012 +0100
+++ b/tests/xmlrpc.py	Sun Jan 22 23:29:18 2012 +0100
@@ -1,16 +1,15 @@
 from multiprocessing import Process
-from sqlalchemy import create_engine
+from sqlalchemy import create_engine, pool
 
 from tempfile import mkdtemp
 import shutil
 
-from iro.controller.database import createDatabase,WithSession, DBDefer
+from iro.model.utils import WithSession, DBDefer, POOL_SIZE as DB_POOL_SIZE
 import iro.model.user as imuser
-import iro.controller.database as db
 
-from iro.model.schema import User
+from iro.model.schema import User, Base
 
-from ngdatabase.mysql import Server,createConfig,Database
+from ngdatabase.mysql import Server, createConfig, Database
 
 class SampleDatabase(Database):
     def createPassword(self):
@@ -19,7 +18,7 @@
 
 from twisted.python import log
 import logging
-logging.basicConfig(level=logging.INFO, format='%(asctime)s %(name)s(%(processName)s)-%(levelname)s: %(message)s')
+logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(name)s(%(processName)s)-%(levelname)s: %(message)s')
 #observer = log.PythonLoggingObserver()
 #observer.start()
 
@@ -41,7 +40,7 @@
     root=getResource()
     root.putChild('debug', XMLRPCDebug())
     reactor.listenTCP(7080, server.Site(root))
-    reactor.suggestThreadPoolSize(5)
+    logging.info("Server is running now...")
     reactor.run()
 
 if __name__ == '__main__':
@@ -54,9 +53,10 @@
         s.start()
         d=SampleDatabase("test","test",'%s/my.cnf'%tdir)
         d.create()
-        db.engine = create_engine('mysql://test:test@localhost/test?unix_socket=%s/socket'%tdir)
-        dbdefer = DBDefer('mysql://test:test@localhost/test?unix_socket=%s/socket'%tdir, pool_size=5)
-
+        engine = create_engine('mysql://test:test@localhost/test?unix_socket=%s/socket'%tdir,
+               poolclass = pool.SingletonThreadPool,  pool_size=DB_POOL_SIZE, )
+        dbdefer = DBDefer(engine)
+        withsession=WithSession(engine, autocommit=True)
         @dbdefer
         def getuser(userhash, session):
             #session.execute("SELECT SLEEP(10)")
@@ -66,10 +66,9 @@
         imuser._getuser=imuser.getuser
         imuser.getuser=getuser
 
-
         try:
-            createDatabase()
-            with WithSession(autocommit=True) as session:
+            Base.metadata.create_all(engine)
+            with withsession as session:
                 session.add(User(name='test',apikey='abcdef123456789'))
             p = Process(target=main)
             p.start()