From 7ab7e70559733a97eb0c77442bfaae7e7e10b790 Mon Sep 17 00:00:00 2001 From: Aaron Rosen Date: Thu, 20 Feb 2014 20:15:21 -0800 Subject: [PATCH] wsgi.run_server no longer used Removes run_server method and test that is not used by anything. Change-Id: I280c3e249b8e3f46de5a3d364a4a34ffc5acd064 Closes-bug: #1282873 --- neutron/tests/unit/test_wsgi.py | 13 ------------- neutron/wsgi.py | 6 ------ 2 files changed, 19 deletions(-) diff --git a/neutron/tests/unit/test_wsgi.py b/neutron/tests/unit/test_wsgi.py index 27338b12a78..1ac1a73bd66 100644 --- a/neutron/tests/unit/test_wsgi.py +++ b/neutron/tests/unit/test_wsgi.py @@ -841,19 +841,6 @@ class ResourceTest(base.BaseTestCase): self.assertEqual(500, result.status_int) -class ServerTest(base.BaseTestCase): - - def test_run_server(self): - with mock.patch('eventlet.listen') as listen: - with mock.patch('eventlet.wsgi.server') as server: - wsgi.run_server(mock.sentinel.application, mock.sentinel.port) - server.assert_called_once_with( - listen.return_value, - mock.sentinel.application - ) - listen.assert_called_once_with(('0.0.0.0', mock.sentinel.port)) - - class MiddlewareTest(base.BaseTestCase): def test_process_response(self): def application(environ, start_response): diff --git a/neutron/wsgi.py b/neutron/wsgi.py index 9d9ff7b90ef..862e3f69ac5 100644 --- a/neutron/wsgi.py +++ b/neutron/wsgi.py @@ -81,12 +81,6 @@ CONF.register_opts(socket_opts) LOG = logging.getLogger(__name__) -def run_server(application, port): - """Run a WSGI server with the given application.""" - sock = eventlet.listen(('0.0.0.0', port)) - eventlet.wsgi.server(sock, application) - - class WorkerService(object): """Wraps a worker to be handled by ProcessLauncher""" def __init__(self, service, application):