Skip to content

Commit

Permalink
run tests with mocked eventlet to avoid 3.13 failures
Browse files Browse the repository at this point in the history
  • Loading branch information
miguelgrinberg committed Oct 13, 2024
1 parent f9a818d commit 5b5d67d
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 39 deletions.
2 changes: 1 addition & 1 deletion src/engineio/async_drivers/eventlet.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def join(self):
return self.g.wait()


class WebSocketWSGI(_WebSocketWSGI):
class WebSocketWSGI(_WebSocketWSGI): # pragma: no cover
def __init__(self, handler, server):
try:
super().__init__(
Expand Down
36 changes: 0 additions & 36 deletions tests/common/test_async_eventlet.py

This file was deleted.

18 changes: 17 additions & 1 deletion tests/common/test_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,14 @@ def test_async_mode_threading(self):
del sys.modules['engineio.async_drivers.threading']

def test_async_mode_eventlet(self):
sys.modules['eventlet'] = mock.MagicMock()
sys.modules['eventlet'].green = mock.MagicMock()
sys.modules['eventlet.green'] = sys.modules['eventlet'].green
sys.modules['eventlet.green'].threading = mock.MagicMock()
sys.modules['eventlet.green.threading'] = \
sys.modules['eventlet.green'].threading
sys.modules['eventlet'].websocket = mock.MagicMock()
sys.modules['eventlet.websocket'] = sys.modules['eventlet'].websocket
s = server.Server(async_mode='eventlet')
assert s.async_mode == 'eventlet'

Expand All @@ -120,6 +128,11 @@ def test_async_mode_eventlet(self):
assert s._async['thread'] == async_eventlet.EventletThread
assert s._async['queue'] == queue.Queue
assert s._async['websocket'] == async_eventlet.WebSocketWSGI
del sys.modules['eventlet']
del sys.modules['eventlet.green']
del sys.modules['eventlet.green.threading']
del sys.modules['eventlet.websocket']
del sys.modules['engineio.async_drivers.eventlet']

@mock.patch('importlib.import_module', side_effect=_mock_import)
def test_async_mode_gevent_uwsgi(self, import_module):
Expand Down Expand Up @@ -228,7 +241,10 @@ def test_async_mode_invalid(self, import_module):
with pytest.raises(ValueError):
server.Server(async_mode='foo')

@mock.patch('importlib.import_module', side_effect=[_mock_async])
@mock.patch(
'importlib.import_module',
side_effect=[_mock_async],
)
def test_async_mode_auto_eventlet(self, import_module):
s = server.Server()
assert s.async_mode == 'eventlet'
Expand Down
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ commands=
deps=
pytest
pytest-cov
eventlet
aiohttp
tornado
requests
Expand Down

0 comments on commit 5b5d67d

Please sign in to comment.