--- a/tests/xmlrpc.py	Wed Feb 08 14:19:46 2012 +0100
+++ b/tests/xmlrpc.py	Thu Feb 09 17:34:47 2012 +0100
@@ -13,20 +13,13 @@
 
 import iro.error as IroError
 
-from .dbtestcase import DBTestCase, setUpModule, tearDownModule
-
-
-#activates all logging we can get.
+from .dbtestcase import DBTestCase
 
-from twisted.python import log
-import logging
-logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(name)s(%(processName)s)-%(levelname)s: %(message)s')
-observer = log.PythonLoggingObserver()
-observer.start()
 
 class XMLRPCTest(DBTestCase):
     """tests for the xmlrpc interface"""
     def setUp(self):
+        DBTestCase.setUp(self)
         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
@@ -75,9 +68,7 @@
         self.failUnlessEqual(self.__rpc2().status('abcdef123456789', '', 0), status)
 
         #JobNotFound
-        with self.assertRaises(Fault) as fault:
-            self.__rpc2().status('abcdef123456789',jid+1)
-        exc = fault.exception
+        exc =  self.assertRaises(Fault, self.__rpc2().status, 'abcdef123456789',jid+1)
         unf = IroError.JobNotFound()
         self.failUnlessEqual(exc.faultCode, unf.code)
         self.failUnlessEqual(exc.faultString, unf.msg)
@@ -89,26 +80,20 @@
     def testNoSuchUser(self):
         '''a unknown user should raise a UserNotNound Exception
         bewcause xmlrpc only has a Fault exception this Exception has to be deliverd through a xmlrpclib.Fault Exception'''
-        with self.assertRaises(Fault) as fault:
-            self.__rpc2().status('abcdef123456789')
-        exc = fault.exception
+        exc = self.assertRaises(Fault, self.__rpc2().status, 'abcdef123456789')
         unf=IroError.UserNotFound()
         self.failUnlessEqual(exc.faultCode, unf.code)
         self.failUnlessEqual(exc.faultString, unf.msg)
 
     def testNoSuchMethod(self):
         '''a unknown mothod should raise a Exception '''
-        with self.assertRaises(Fault) as fault:
-            self.__rpc2().nosuchmethod()
-        exc = fault.exception
+        exc =  self.assertRaises(Fault, self.__rpc2().nosuchmethod)
         self.failUnlessEqual(exc.faultCode, 8001)
         self.failUnlessEqual(exc.faultString, "procedure nosuchmethod not found")
     
     def testValidationFault(self):
         '''a validate Exception should be translated to a xmlrpclib.Fault.'''
-        with self.assertRaises(Fault) as fault:
-            self.__rpc2().status('xxx')
-        exc = fault.exception
+        exc =  self.assertRaises(Fault, self.__rpc2().status,'xxx')
         self.failUnlessEqual(exc.faultCode, 700)
         self.failUnlessEqual(exc.faultString, "Validation of 'apikey' failed.")
 
@@ -121,9 +106,7 @@
             session.add(u)
         self.failUnlessEqual(self.__rpc2().routes('abcdef123456789','sms'),['sipgate_basic'])
 
-        with self.assertRaises(Fault) as fault:
-            self.__rpc2().routes('abcdef123456789','fax')
-        exc = fault.exception
+        exc = self.assertRaises(Fault, self.__rpc2().routes,'abcdef123456789','fax')
         self.failUnlessEqual(exc.faultCode, 700)
         self.failUnlessEqual(exc.faultString, "Typ is not valid.")
         
@@ -161,9 +144,7 @@
 
         invalid=['xa','+1','1-23',';:+0','0123']
 
-        with self.assertRaises(Fault) as fault:
-            self.__rpc2().telnumber(['01234']+invalid)
-        exc = fault.exception
+        exc =  self.assertRaises(Fault, self.__rpc2().telnumber,['01234']+invalid)
         self.failUnlessEqual(exc.faultCode, 701)
         self.failUnlessEqual(exc.faultString, "No valid telnumber: '%s'" % invalid[0])
 
@@ -176,9 +157,7 @@
     def testInvaildEmail(self):
         '''test invaild email adresses (got from wikipedia)'''
         invalid=["Abc.example.com",]
-        with self.assertRaises(Fault) as fault:
-            self.__rpc2().email(invalid)
-        exc = fault.exception
+        exc= self.assertRaises(Fault, self.__rpc2().email, invalid)
         self.failUnlessEqual(exc.faultCode, 702)
         self.failUnlessEqual(exc.faultString, "No valid email: '%s'" % invalid[0])