Skip to content

[pyamqp] os error add #27351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
l0lawrence merged 14 commits into from
Nov 18, 2022
Merged

[pyamqp] os error add #27351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d698ab3
os error add
l0lawrence Nov 7, 2022
e3ff8c4
update except statement
l0lawrence Nov 10, 2022
cae8238
test mock of receive_bytes on pipeline
l0lawrence Nov 10, 2022
66b91f9
client os error
l0lawrence Nov 10, 2022
d8ab387
mock try 2
l0lawrence Nov 10, 2022
0c56075
pylint
l0lawrence Nov 10, 2022
d3474d9
fix patch line
l0lawrence Nov 10, 2022
eb27cfb
fixed mock
l0lawrence Nov 11, 2022
fe01ffa
newline
l0lawrence Nov 11, 2022
d3170f4
fixing spacing
l0lawrence Nov 15, 2022
21c57f2
unused import
l0lawrence Nov 15, 2022
d315ef5
Merge branch 'feature/eventhub/pyproto' into oserror_catch
l0lawrence Nov 16, 2022
d513fd2
Merge branch 'feature/eventhub/pyproto' of https://github.com/Azure/a…
l0lawrence Nov 17, 2022
66fbb45
fix error mssgs
l0lawrence Nov 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions sdk/eventhub/azure-eventhub/azure/eventhub/_pyamqp/aio/_transport_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,9 +532,9 @@ async def connect(self):
raise ValueError(
"Please install aiohttp library to use websocket transport."
)
except OSError:
except OSError as e:
await self.session.close()
raise ConnectionError('Client Session Closed')
raise ConnectionError('Websocket connection closed: %r' % e) from e
Comment thread
swathipil marked this conversation as resolved.

async def _read(self, n, buffer=None, **kwargs): # pylint: disable=unused-argument
"""Read exactly n bytes from the peer."""
Expand All @@ -558,6 +558,9 @@ async def _read(self, n, buffer=None, **kwargs): # pylint: disable=unused-argum
return view
except asyncio.TimeoutError as te:
raise ConnectionError('Receive timed out (%s)' % te)
except OSError as e:
await self.session.close()
raise ConnectionError('Websocket connection closed: %r' % e) from e

async def close(self):
"""Do any preliminary work in shutting down the connection."""
Expand All @@ -575,3 +578,6 @@ async def write(self, s):
await self.ws.send_bytes(s)
except asyncio.TimeoutError as te:
raise ConnectionError('Send timed out (%s)' % te)
except OSError as e:
await self.session.close()
raise ConnectionError('Websocket connection closed: %r' % e) from e
14 changes: 14 additions & 0 deletions sdk/eventhub/azure-eventhub/tests/pyamqp_tests/unittest/test_websocket_exception.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import pytest
import asyncio
from unittest.mock import patch

import aiohttp
from azure.eventhub._pyamqp.aio._transport_async import WebSocketTransportAsync


# class WebsocketException(unittest.TestCase):
async def test_websocket_aiohttp_exception():
Comment thread
swathipil marked this conversation as resolved.
with patch.object(aiohttp.ClientSession,'ws_connect', side_effect=aiohttp.ClientOSError):
transport = WebSocketTransportAsync(host="my_host")
with pytest.raises(ConnectionError):
await transport.connect()