Merge "Support IPv6 in the finger log streamer" into feature/zuulv3
This commit is contained in:
commit
ffbb3f9c72
|
@ -35,7 +35,7 @@ class TestLogStreamer(tests.base.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestLogStreamer, self).setUp()
|
super(TestLogStreamer, self).setUp()
|
||||||
self.host = '0.0.0.0'
|
self.host = '::'
|
||||||
|
|
||||||
def startStreamer(self, port, root=None):
|
def startStreamer(self, port, root=None):
|
||||||
if not root:
|
if not root:
|
||||||
|
@ -64,7 +64,7 @@ class TestStreaming(tests.base.AnsibleZuulTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestStreaming, self).setUp()
|
super(TestStreaming, self).setUp()
|
||||||
self.host = '0.0.0.0'
|
self.host = '::'
|
||||||
self.streamer = None
|
self.streamer = None
|
||||||
self.stop_streamer = False
|
self.stop_streamer = False
|
||||||
self.streaming_data = ''
|
self.streaming_data = ''
|
||||||
|
@ -158,7 +158,7 @@ class TestStreaming(tests.base.AnsibleZuulTestCase):
|
||||||
|
|
||||||
def runWSClient(self, build_uuid, event):
|
def runWSClient(self, build_uuid, event):
|
||||||
async def client(loop, build_uuid, event):
|
async def client(loop, build_uuid, event):
|
||||||
uri = 'http://127.0.0.1:9000/console-stream'
|
uri = 'http://[::1]:9000/console-stream'
|
||||||
try:
|
try:
|
||||||
session = aiohttp.ClientSession(loop=loop)
|
session = aiohttp.ClientSession(loop=loop)
|
||||||
async with session.ws_connect(uri) as ws:
|
async with session.ws_connect(uri) as ws:
|
||||||
|
@ -223,7 +223,7 @@ class TestStreaming(tests.base.AnsibleZuulTestCase):
|
||||||
|
|
||||||
# Start the web server
|
# Start the web server
|
||||||
web_server = zuul.web.ZuulWeb(
|
web_server = zuul.web.ZuulWeb(
|
||||||
listen_address='127.0.0.1', listen_port=9000,
|
listen_address='::', listen_port=9000,
|
||||||
gear_server='127.0.0.1', gear_port=self.gearman_server.port)
|
gear_server='127.0.0.1', gear_port=self.gearman_server.port)
|
||||||
loop = asyncio.new_event_loop()
|
loop = asyncio.new_event_loop()
|
||||||
loop.set_debug(True)
|
loop.set_debug(True)
|
||||||
|
|
|
@ -168,6 +168,8 @@ class CustomForkingTCPServer(socketserver.ForkingTCPServer):
|
||||||
'''
|
'''
|
||||||
Custom version that allows us to drop privileges after port binding.
|
Custom version that allows us to drop privileges after port binding.
|
||||||
'''
|
'''
|
||||||
|
address_family = socket.AF_INET6
|
||||||
|
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
self.user = kwargs.pop('user')
|
self.user = kwargs.pop('user')
|
||||||
self.jobdir_root = kwargs.pop('jobdir_root')
|
self.jobdir_root = kwargs.pop('jobdir_root')
|
||||||
|
|
Loading…
Reference in New Issue