Merge "make IPv6 unit test work on systems with eth0"
This commit is contained in:
commit
c72bae2b2e
@ -41,29 +41,39 @@ class TestWSGIServer(unittest.TestCase):
|
|||||||
server.stop()
|
server.stop()
|
||||||
server.wait()
|
server.wait()
|
||||||
|
|
||||||
|
def test_ipv6_listen_called_with_scope(self):
|
||||||
|
server = wsgi.Server("test_app")
|
||||||
|
|
||||||
class TestWSGIServer2(unittest.TestCase):
|
with mock.patch.object(wsgi.eventlet, 'listen') as mock_listen:
|
||||||
def setUp(self):
|
with mock.patch.object(socket, 'getaddrinfo') as mock_get_addr:
|
||||||
self.eventlet_p = mock.patch.object(wsgi, 'eventlet')
|
mock_get_addr.return_value = [
|
||||||
self.eventlet = self.eventlet_p.start()
|
(socket.AF_INET6,
|
||||||
self.server = wsgi.Server("test_app")
|
socket.SOCK_STREAM,
|
||||||
|
socket.IPPROTO_TCP,
|
||||||
|
'',
|
||||||
|
('fe80::204:acff:fe96:da87%eth0', 1234, 0, 2))
|
||||||
|
]
|
||||||
|
with mock.patch.object(server, 'pool') as mock_pool:
|
||||||
|
server.start(None,
|
||||||
|
1234,
|
||||||
|
host="fe80::204:acff:fe96:da87%eth0")
|
||||||
|
|
||||||
def tearDown(self):
|
mock_get_addr.assert_called_once_with(
|
||||||
self.eventlet_p.stop()
|
"fe80::204:acff:fe96:da87%eth0",
|
||||||
|
1234,
|
||||||
|
socket.AF_UNSPEC,
|
||||||
|
socket.SOCK_STREAM
|
||||||
|
)
|
||||||
|
|
||||||
def test_ipv6_with_link_local_start(self):
|
mock_listen.assert_called_once_with(
|
||||||
mock_app = mock.Mock()
|
('fe80::204:acff:fe96:da87%eth0', 1234, 0, 2),
|
||||||
with mock.patch.object(self.server, 'pool') as pool:
|
family=socket.AF_INET6,
|
||||||
self.server.start(mock_app,
|
backlog=128
|
||||||
0,
|
)
|
||||||
host="fe80::204:acff:fe96:da87%eth0")
|
|
||||||
self.eventlet.assert_has_calls([
|
mock_pool.spawn.assert_has_calls([
|
||||||
mock.call.listen(('fe80::204:acff:fe96:da87%eth0', 0, 0, 2),
|
mock.call(
|
||||||
backlog=128,
|
server._run,
|
||||||
family=10)
|
None,
|
||||||
])
|
mock_listen.return_value)
|
||||||
pool.spawn.assert_has_calls([mock.call(
|
])
|
||||||
self.server._run,
|
|
||||||
mock_app,
|
|
||||||
self.eventlet.listen.mock_calls[0].return_value)
|
|
||||||
])
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user