Skip to content
Prev Previous commit
Next Next commit
Merge branch 'main' into swathipil/eh/sslcontext-kwarg
  • Loading branch information
swathipil authored Nov 1, 2024
commit 5d3f8d4b159481beedce1a13c10c8e918e16211a
48 changes: 24 additions & 24 deletions sdk/eventhub/azure-eventhub/azure/eventhub/_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,30 @@

class Configuration: # pylint:disable=too-many-instance-attributes
def __init__(
self, # pylint:disable=unused-argument
*,
hostname: str,
amqp_transport: Union["AmqpTransport", "AmqpTransportAsync"],
socket_timeout: Optional[float] = None,
user_agent: Optional[str] = None,
retry_total: int = 3,
retry_mode: Union[str, RetryMode] = RetryMode.Exponential,
retry_backoff_factor: float = 0.8,
retry_backoff_max: int = 120,
network_tracing: bool = False,
http_proxy: Optional[Dict[str, Any]] = None,
transport_type: TransportType = TransportType.Amqp,
auth_timeout: int = 60,
prefetch: int = 300,
max_batch_size: int = 300,
receive_timeout: int = 0,
send_timeout: int = 60,
custom_endpoint_address: Optional[str] = None,
connection_verify: Optional[str] = None,
use_tls: bool = True,
ssl_context: Optional["SSLContext"] = None,
**kwargs: Any
):
self, # pylint:disable=unused-argument
*,
hostname: str,
amqp_transport: Union["AmqpTransport", "AmqpTransportAsync"],
socket_timeout: Optional[float] = None,
user_agent: Optional[str] = None,
retry_total: int = 3,
retry_mode: Union[str, RetryMode] = RetryMode.Exponential,
retry_backoff_factor: float = 0.8,
retry_backoff_max: int = 120,
network_tracing: bool = False,
http_proxy: Optional[Dict[str, Any]] = None,
transport_type: TransportType = TransportType.Amqp,
auth_timeout: int = 60,
prefetch: int = 300,
max_batch_size: int = 300,
receive_timeout: int = 0,
send_timeout: int = 60,
custom_endpoint_address: Optional[str] = None,
connection_verify: Optional[str] = None,
ssl_context: Optional["SSLContext"] = None,
use_tls: bool = True,
**kwargs: Any
):
self.user_agent = user_agent
self.retry_total = retry_total
self.max_retries = self.retry_total
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def __init__(
socket_settings=None,
raise_on_initial_eintr=True,
use_tls: bool = True,
**kwargs
**kwargs,
):
self._quick_recv = None
self.connected = False
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
from io import BytesIO
import logging


from .._platform import KNOWN_TCP_OPTS, SOL_TCP
from .._encode import encode_frame
from .._decode import decode_frame, decode_empty_frame
Expand Down
2 changes: 2 additions & 0 deletions sdk/eventhub/azure-eventhub/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,12 @@ def sleep(request):
def uamqp_transport(request):
return request.param


@pytest.fixture(scope="session", params=socket_transports, ids=socket_transport_ids)
def socket_transport(request):
return request.param


@pytest.fixture(scope="session")
def storage_url():
try:
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.