Log message for revision 69755: separating server start into own layer
Changed: U Zope/branches/whitmo-2.10-layers/lib/python/Testing/ZopeTestCase/testWebserver.py -=- Modified: Zope/branches/whitmo-2.10-layers/lib/python/Testing/ZopeTestCase/testWebserver.py =================================================================== --- Zope/branches/whitmo-2.10-layers/lib/python/Testing/ZopeTestCase/testWebserver.py 2006-08-24 03:55:06 UTC (rev 69754) +++ Zope/branches/whitmo-2.10-layers/lib/python/Testing/ZopeTestCase/testWebserver.py 2006-08-24 04:19:45 UTC (rev 69755) @@ -45,11 +45,9 @@ # Create the error_log object ZopeTestCase.utils.setupSiteErrorLog() -# Start the web server -host, port = ZopeTestCase.utils.startZServer(4) -folder_url = 'http://%s:%d/%s' %(host, port, ZopeTestCase.folder_name) + class ManagementOpener(urllib.FancyURLopener): '''Logs on as manager when prompted''' def prompt_user_passwd(self, host, realm): @@ -60,9 +58,29 @@ def prompt_user_passwd(self, host, realm): raise Unauthorized, 'The URLopener was asked for authentication' +from layer import Zope2Layer +folder_url, host, port = None, None, None + +class WebserverLayer(Zope2Layer): + @classmethod + def setUp(cls): + global host, port, folder_url + # Start the web server + host, port = ZopeTestCase.utils.startZServer(4) + folder_url = 'http://%s:%d/%s' %(host, port, ZopeTestCase.folder_name) + + @classmethod + def tearDown(cls): + import Testing.ZopeTestCase.utils + Testing.ZopeTestCase.utils._Z2HOST = None + Testing.ZopeTestCase.utils._Z2PORT = None + # XXX shut down the zserver too + class TestWebserver(ZopeTestCase.ZopeTestCase): + layer = WebserverLayer + def afterSetUp(self): uf = self.folder.acl_users uf.userFolderAddUser('manager', 'secret', ['Manager'], []) _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins