Skip to content

Commit 000d3a3

Browse files
fix unit
Signed-off-by: Vikrant Puppala <[email protected]>
1 parent d00e3c8 commit 000d3a3

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

src/databricks/sql/auth/common.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ def __init__(
7272
self.retry_stop_after_attempts_count = retry_stop_after_attempts_count or 5
7373
self.retry_delay_min = retry_delay_min or 1.0
7474
self.retry_delay_max = retry_delay_max or 60.0
75-
self.retry_stop_after_attempts_duration = retry_stop_after_attempts_duration or 900.0
75+
self.retry_stop_after_attempts_duration = (
76+
retry_stop_after_attempts_duration or 900.0
77+
)
7678
self.retry_delay_default = retry_delay_default or 5.0
7779
self.retry_dangerous_codes = retry_dangerous_codes or []
7880
self.http_proxy = http_proxy

src/databricks/sql/client.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,10 +376,14 @@ def _build_client_context(self, server_hostname: str, **kwargs):
376376
hostname=server_hostname,
377377
ssl_options=ssl_options,
378378
socket_timeout=kwargs.get("_socket_timeout"),
379-
retry_stop_after_attempts_count=kwargs.get("_retry_stop_after_attempts_count"),
379+
retry_stop_after_attempts_count=kwargs.get(
380+
"_retry_stop_after_attempts_count"
381+
),
380382
retry_delay_min=kwargs.get("_retry_delay_min"),
381383
retry_delay_max=kwargs.get("_retry_delay_max"),
382-
retry_stop_after_attempts_duration=kwargs.get("_retry_stop_after_attempts_duration"),
384+
retry_stop_after_attempts_duration=kwargs.get(
385+
"_retry_stop_after_attempts_duration"
386+
),
383387
retry_delay_default=kwargs.get("_retry_delay_default"),
384388
retry_dangerous_codes=kwargs.get("_retry_dangerous_codes"),
385389
http_proxy=kwargs.get("_http_proxy"),

src/databricks/sql/common/unified_http_client.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def _setup_pool_manager(self):
7878
delay_default=self.config.retry_delay_default,
7979
force_dangerous_codes=self.config.retry_dangerous_codes,
8080
)
81-
81+
8282
# Initialize the required attributes that DatabricksRetryPolicy expects
8383
# but doesn't initialize in its constructor
8484
self._retry_policy._command_type = None
@@ -152,10 +152,10 @@ def request_context(
152152
logger.debug("Making %s request to %s", method, url)
153153

154154
request_headers = self._prepare_headers(headers)
155-
155+
156156
# Prepare retry policy for this request
157157
self._prepare_retry_policy()
158-
158+
159159
response = None
160160

161161
try:

tests/unit/test_retry.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def test_sleep__no_retry_after(self, t_mock, retry_policy, error_history):
3434
retry_policy.history = [error_history, error_history]
3535
retry_policy.sleep(HTTPResponse(status=503))
3636

37-
expected_backoff_time = max(
37+
expected_backoff_time = min(
3838
self.calculate_backoff_time(
3939
0, retry_policy.delay_min, retry_policy.delay_max
4040
),
@@ -57,7 +57,7 @@ def test_sleep__no_retry_after_header__multiple_retries(self, t_mock, retry_poli
5757
expected_backoff_times = []
5858
for attempt in range(num_attempts):
5959
expected_backoff_times.append(
60-
max(
60+
min(
6161
self.calculate_backoff_time(
6262
attempt, retry_policy.delay_min, retry_policy.delay_max
6363
),

0 commit comments

Comments
 (0)