Skip to content

Commit 7604f0f

Browse files
committed
Reuse one retry callable inline
1 parent 8e9ddd0 commit 7604f0f

File tree

1 file changed

+3
-29
lines changed

1 file changed

+3
-29
lines changed

admin/create_secrets_files.py

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,12 @@
2525
from vws_web_tools import DatabaseDict, VuMarkDatabaseDict
2626

2727

28-
@retry(
28+
RETRY_ON_TIMEOUT = retry(
2929
retry=retry_if_exception_type(exception_types=TimeoutException),
3030
stop=stop_after_attempt(max_attempt_number=3),
3131
wait=wait_exponential(multiplier=2, min=5, max=30),
3232
reraise=True,
3333
)
34-
def _get_database_details_with_retries(
35-
driver: "WebDriver",
36-
database_name: str,
37-
) -> "DatabaseDict":
38-
"""Get cloud database details with retries on timeout."""
39-
return vws_web_tools.get_database_details(
40-
driver=driver,
41-
database_name=database_name,
42-
)
4334

4435

4536
def _create_and_get_database_details(
@@ -67,7 +58,7 @@ def _create_and_get_database_details(
6758
license_name=license_name,
6859
)
6960

70-
return _get_database_details_with_retries(
61+
return RETRY_ON_TIMEOUT(vws_web_tools.get_database_details)(
7162
driver=driver,
7263
database_name=database_name,
7364
)
@@ -86,29 +77,12 @@ def _create_and_get_vumark_details(
8677
database_name=vumark_database_name,
8778
)
8879

89-
return _get_vumark_details_with_retries(
80+
return RETRY_ON_TIMEOUT(vws_web_tools.get_vumark_database_details)(
9081
driver=driver,
9182
database_name=vumark_database_name,
9283
)
9384

9485

95-
@retry(
96-
retry=retry_if_exception_type(exception_types=TimeoutException),
97-
stop=stop_after_attempt(max_attempt_number=3),
98-
wait=wait_exponential(multiplier=2, min=5, max=30),
99-
reraise=True,
100-
)
101-
def _get_vumark_details_with_retries(
102-
driver: "WebDriver",
103-
database_name: str,
104-
) -> "VuMarkDatabaseDict":
105-
"""Get VuMark database details with retries on timeout."""
106-
return vws_web_tools.get_vumark_database_details(
107-
driver=driver,
108-
database_name=database_name,
109-
)
110-
111-
11286
def _generate_secrets_file_content(
11387
database_details: "DatabaseDict",
11488
vumark_details: "VuMarkDatabaseDict",

0 commit comments

Comments
 (0)