--- a/tests/xmlrpc.py	Sun Jan 22 23:29:18 2012 +0100
+++ b/tests/xmlrpc.py	Sun Jan 22 23:53:27 2012 +0100
@@ -4,7 +4,7 @@
 from tempfile import mkdtemp
 import shutil
 
-from iro.model.utils import WithSession, DBDefer, POOL_SIZE as DB_POOL_SIZE
+from iro.model.utils import WithSession, POOL_SIZE as DB_POOL_SIZE
 import iro.model.user as imuser
 
 from iro.model.schema import User, Base
@@ -55,20 +55,12 @@
         d.create()
         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)")
-            return imuser._getuser(userhash = userhash, session=session) 
-        
-        imuser.dbdefer=dbdefer
-        imuser._getuser=imuser.getuser
-        imuser.getuser=getuser
+
+        imuser.setEngine(engine)
 
         try:
             Base.metadata.create_all(engine)
-            with withsession as session:
+            with WithSession(engine, autocommit=True) as session:
                 session.add(User(name='test',apikey='abcdef123456789'))
             p = Process(target=main)
             p.start()