Merge "Support IPv6 in the finger log streamer" into feature/zuulv3

This commit is contained in:
Zuul 2017-09-11 15:55:46 +00:00 committed by Gerrit Code Review
commit ffbb3f9c72
2 changed files with 6 additions and 4 deletions

View File

@ -35,7 +35,7 @@ class TestLogStreamer(tests.base.BaseTestCase):
def setUp(self):
super(TestLogStreamer, self).setUp()
self.host = '0.0.0.0'
self.host = '::'
def startStreamer(self, port, root=None):
if not root:
@ -64,7 +64,7 @@ class TestStreaming(tests.base.AnsibleZuulTestCase):
def setUp(self):
super(TestStreaming, self).setUp()
self.host = '0.0.0.0'
self.host = '::'
self.streamer = None
self.stop_streamer = False
self.streaming_data = ''
@ -158,7 +158,7 @@ class TestStreaming(tests.base.AnsibleZuulTestCase):
def runWSClient(self, 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:
session = aiohttp.ClientSession(loop=loop)
async with session.ws_connect(uri) as ws:
@ -223,7 +223,7 @@ class TestStreaming(tests.base.AnsibleZuulTestCase):
# Start the web server
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)
loop = asyncio.new_event_loop()
loop.set_debug(True)

View File

@ -168,6 +168,8 @@ class CustomForkingTCPServer(socketserver.ForkingTCPServer):
'''
Custom version that allows us to drop privileges after port binding.
'''
address_family = socket.AF_INET6
def __init__(self, *args, **kwargs):
self.user = kwargs.pop('user')
self.jobdir_root = kwargs.pop('jobdir_root')