openstack/oslo.service
Code Issues Proposed changes

Merge "Fix wsgi SSL tests for wsgi module under python 3"

Browse Source
This commit is contained in:
Zuul 2020-06-23 18:30:37 +00:00 committed by Gerrit Code Review
commit 585768b94d
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
oslo_service/tests/test_wsgi.py
View File

@ -265,15 +265,21 @@ class TestWSGIServer(WsgiTestCase):
server.stop() server.stop()
def requesting(host, port, ca_certs, method="POST", def requesting(host, port, ca_certs=None, method="POST",
content_type="application/x-www-form-urlencoded", content_type="application/x-www-form-urlencoded",
address_familly=socket.AF_INET): address_familly=socket.AF_INET):
frame = bytes("{verb} / HTTP/1.1\r\n\r\n".format(verb=method), "utf-8") frame = bytes("{verb} / HTTP/1.1\r\n\r\n".format(verb=method), "utf-8")
with socket.socket(address_familly, socket.SOCK_STREAM) as sock: with socket.socket(address_familly, socket.SOCK_STREAM) as sock:
with eventlet.wrap_ssl(sock, ca_certs=ca_certs) as wrappedSocket: if ca_certs:
wrappedSocket.connect((host, port)) with eventlet.wrap_ssl(sock, ca_certs=ca_certs) as wrappedSocket:
wrappedSocket.send(frame) wrappedSocket.connect((host, port))
data = wrappedSocket.recv(1024).decode() wrappedSocket.send(frame)
data = wrappedSocket.recv(1024).decode()
return data
else:
sock.connect((host, port))
sock.send(frame)
data = sock.recv(1024).decode()
return data return data
@ -312,7 +318,6 @@ class TestWSGIServerWithSSL(WsgiTestCase):
fake_ssl_server.stop() fake_ssl_server.stop()
fake_ssl_server.wait() fake_ssl_server.wait()
@testtools.skip("bug/1482633: test hangs on Python 3")
def test_two_servers(self): def test_two_servers(self):
def test_app(env, start_response): def test_app(env, start_response):
start_response('200 OK', {}) start_response('200 OK', {})
@ -328,14 +333,20 @@ class TestWSGIServerWithSSL(WsgiTestCase):
fake_server.start() fake_server.start()
self.assertNotEqual(0, fake_server.port) self.assertNotEqual(0, fake_server.port)
response = requests.post( response = requesting(
'https://127.0.0.1:%s/' % fake_ssl_server.port, method='GET',
verify=os.path.join(SSL_CERT_DIR, 'ca.crt'), data='PING') host='127.0.0.1',
self.assertEqual('PONG', response.text) port=fake_ssl_server.port,
ca_certs=os.path.join(SSL_CERT_DIR, 'ca.crt'),
)
self.assertEqual('PONG', response[-4:])
response = requests.post( response = requesting(
'http://127.0.0.1:%s/' % fake_server.port, data='PING') method='GET',
self.assertEqual('PONG', response.text) host='127.0.0.1',
port=fake_server.port,
)
self.assertEqual('PONG', response[-4:])
fake_ssl_server.stop() fake_ssl_server.stop()
fake_ssl_server.wait() fake_ssl_server.wait()