Merge "Move wsgi.Service socket creation into the constructor."

2 files changed, 5 insertions, 6 deletions

diff --git a/openstack/common/wsgi.py b/openstack/common/wsgi.py
index 47f97a2..d7fae9b 100644
--- a/openstack/common/wsgi.py
+++ b/openstack/common/wsgi.py
@@ -79,6 +79,7 @@ class Service(service.Service):
         self._port = port
         self._host = host
         self._backlog = backlog if backlog else CONF.backlog
+        self._socket = self._get_socket(host, port, self._backlog)
         super(Service, self).__init__(threads)
 
     def _get_socket(self, host, port, backlog):
@@ -129,7 +130,6 @@ class Service(service.Service):
 
         """
         super(Service, self).start()
-        self._socket = self._get_socket(self._host, self._port, self._backlog)
         self.tg.add_thread(self._run, self.application, self._socket)
 
     @property
diff --git a/tests/unit/test_wsgi.py b/tests/unit/test_wsgi.py
index 9a2e04b..94d8092 100644
--- a/tests/unit/test_wsgi.py
+++ b/tests/unit/test_wsgi.py
@@ -544,10 +544,6 @@ class WSGIServerTest(utils.BaseTestCase):
         server.stop()
 
     def test_ipv6_listen_called_with_scope(self):
-        server = wsgi.Service("test_app",
-                              1234,
-                              host="fe80::204:acff:fe96:da87%eth0")
-
         with mock.patch.object(wsgi.eventlet, 'listen') as mock_listen:
             with mock.patch.object(socket, 'getaddrinfo') as mock_get_addr:
                 mock_get_addr.return_value = [
@@ -557,7 +553,10 @@ class WSGIServerTest(utils.BaseTestCase):
                      '',
                      ('fe80::204:acff:fe96:da87%eth0', 1234, 0, 2))
                 ]
-                server.start()
+
+                wsgi.Service("test_app",
+                             1234,
+                             host="fe80::204:acff:fe96:da87%eth0")
 
                 mock_get_addr.assert_called_once_with(
                     "fe80::204:acff:fe96:da87%eth0",