Skip to content
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

Jump to bottom

[ServiceBus] mode (ReceiveMode) parameter needs better exception behavior #13531

Merged
merged 5 commits into from
Sep 21, 2020
Merged

[ServiceBus] mode (ReceiveMode) parameter needs better exception behavior #13531

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0ee28be
mode parameter needs better exception behavior, as if it is mis-typed…
KieranBrantnerMagee Sep 2, 2020
7df95cb
Merge from upstream master
KieranBrantnerMagee Sep 9, 2020
50d00cf
merge from upstream master
KieranBrantnerMagee Sep 15, 2020
2eb7d63
Fix mode->receive_mode change missed in merge (within test)
KieranBrantnerMagee Sep 18, 2020
fc246ea
Update CHANGELOG.md
KieranBrantnerMagee Sep 21, 2020
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
4 changes: 4 additions & 0 deletions sdk/servicebus/azure-servicebus/azure/servicebus/_common/receiver_mixins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ def _populate_attributes(self, **kwargs):
self._auth_uri = "sb://{}/{}".format(self.fully_qualified_namespace, self.entity_path)
self._entity_uri = "amqps://{}/{}".format(self.fully_qualified_namespace, self.entity_path)
self._receive_mode = kwargs.get("receive_mode", ReceiveMode.PeekLock)
# While we try to leave failures to the service, in this case the errors lower down the stack are less clear.
if not isinstance(self._receive_mode, ReceiveMode):
raise TypeError("Parameter 'receive_mode' must be of type ReceiveMode")

self._error_policy = _ServiceBusErrorPolicy(
max_retries=self._config.retry_total
)
Expand Down
11 changes: 6 additions & 5 deletions sdk/servicebus/azure-servicebus/tests/test_queues.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1857,11 +1857,12 @@ def test_queue_receiver_invalid_mode(self, servicebus_namespace_connection_strin

with ServiceBusClient.from_connection_string(
servicebus_namespace_connection_string, logging_enable=False) as sb_client:
# with pytest.raises(StopIteration):
with sb_client.get_queue_receiver(servicebus_queue.name,
max_wait_time="oij") as receiver:

assert receiver
with pytest.raises(TypeError):
with sb_client.get_queue_receiver(servicebus_queue.name,
receive_mode=2) as receiver:

raise Exception("Should not get here, should fail fast.")


@pytest.mark.liveTest
@pytest.mark.live_test_only
Expand Down