diff -r 35228d665310 -r 3df3da063cff iro/tests/stopableServer.py --- a/iro/tests/stopableServer.py Thu Nov 18 02:58:28 2010 +0100 +++ b/iro/tests/stopableServer.py Thu Nov 18 03:00:47 2010 +0100 @@ -50,6 +50,8 @@ self.stop() +class Internal: + pass def init_server(): userlist=[{"name":"test","password":"test", "class":User}, @@ -60,14 +62,17 @@ class MyManager(BaseManager): pass + + internal=Internal() MyManager.register('SMSJob', SMSJob) - MyManager.register('FAXob', FAXJob) + MyManager.register('FaxJob', FAXJob) MyManager.register('MailJob',MailJob) MyManager.register('Providerlist',Providerlist) manager = MyManager() manager.start() + internal.manager=manager #anbieter erzeugen und konfigurieren sip=anbieter.sipgate() @@ -81,7 +86,9 @@ #Benutzerdatenbank erstellen queue = Queue() + internal.queue=queue provider=Providerlist() + internal.provider=provider provider.add("sipgate", sip, ["sms", "fax", ]) provider.add("smstrade", smstrade, ["sms", ]) provider.add("geonet", None, ["sms", "fax", ]) @@ -91,7 +98,9 @@ provider.setDefault("fax","sipgate") provider.setDefault("mail","localhost") jobqueue=Joblist(manager, queue, provider) + internal.jobqueue=jobqueue userdb=MyUserDB(userlist,jobqueue) + internal.userdb=userdb #Server starten @@ -104,5 +113,6 @@ certificate=cert,privatekey=key, logRequests=False) serv.relam="xmlrpc" - return serv + internal.serv=serv + return internal