Skip to content

Commit

Permalink
green urlopen was blocking on https
Browse files Browse the repository at this point in the history
fixes #457
  • Loading branch information
temoto committed Dec 6, 2022
1 parent 650db31 commit 902fa95
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 2 deletions.
2 changes: 1 addition & 1 deletion eventlet/green/http/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -1443,7 +1443,7 @@ def getresponse(self):
raise

try:
import ssl
from eventlet.green import ssl
except ImportError:
pass
else:
Expand Down
29 changes: 28 additions & 1 deletion tests/green_http_test.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
import eventlet
import sys

import six
from nose.plugins.skip import SkipTest

import eventlet
import eventlet.debug
import tests
from eventlet.green.urllib.request import urlopen
from tests import tool_server

__test__ = six.PY3

Expand All @@ -22,3 +29,23 @@ def test_http_request_encode_chunked_kwarg():
addr = server_sock.getsockname()
h = client.HTTPConnection(host=addr[0], port=addr[1])
h.request('GET', '/', encode_chunked=True)


def test_urlopen_http_concurrent():
if sys.version_info < (3,):
raise SkipTest()
eventlet.debug.hub_blocking_detection(True)
with tool_server.http_server_const() as url:
r = urlopen(url, timeout=1)
assert r.status == 200
eventlet.debug.hub_blocking_detection(False)


def test_urlopen_https_concurrent():
if sys.version_info < (3,):
raise SkipTest()
eventlet.debug.hub_blocking_detection(True)
with tool_server.http_server_const(tls=True) as url:
r = urlopen(url, timeout=1, cafile=tool_server.CA_CERTS)
assert r.status == 200
eventlet.debug.hub_blocking_detection(False)

0 comments on commit 902fa95

Please sign in to comment.