|
26 | 26 |
|
27 | 27 | from awscli.customizations.s3 import constants |
28 | 28 | from awscli.customizations.s3.factory import ( |
29 | | - ADAPTIVE_RETRY_MODE, |
30 | 29 | CRT_PART_SIZE_EXCEEDS_MEMORY_LIMIT, |
31 | 30 | MAX_CRT_CONNECT_TIMEOUT_MS, |
32 | 31 | MAX_CRT_MAX_RETRIES, |
@@ -910,11 +909,11 @@ def test_resolves_to_classic_when_max_bandwidth_configured( |
910 | 909 | == constants.CLASSIC_TRANSFER_CLIENT |
911 | 910 | ) |
912 | 911 |
|
913 | | - def test_resolves_to_classic_for_adaptive_retry_mode( |
| 912 | + def test_resolves_to_crt_for_adaptive_retry_mode( |
914 | 913 | self, resolve_client_type, auto_resolve_session |
915 | 914 | ): |
916 | 915 | stub_config_variables(auto_resolve_session, retry_mode='adaptive') |
917 | | - assert resolve_client_type() == constants.CLASSIC_TRANSFER_CLIENT |
| 916 | + assert resolve_client_type() == constants.CRT_TRANSFER_CLIENT |
918 | 917 |
|
919 | 918 | def test_resolves_to_crt_for_standard_retry_mode( |
920 | 919 | self, resolve_client_type, auto_resolve_session |
@@ -983,8 +982,6 @@ def test_warns_when_routed_away_for_max_bandwidth( |
983 | 982 | def test_does_not_warn_for_adaptive_retry_mode( |
984 | 983 | self, resolve_client_type, auto_resolve_session, capsys |
985 | 984 | ): |
986 | | - # The crt transfer client will eventually support adaptive retries, so |
987 | | - # there is nothing for the user to act on. |
988 | 985 | stub_config_variables(auto_resolve_session, retry_mode='adaptive') |
989 | 986 | resolve_client_type() |
990 | 987 | assert capsys.readouterr().err == '' |
@@ -1124,12 +1121,11 @@ def test_does_not_warn_for_max_bandwidth_when_classic_resolved( |
1124 | 1121 | == '' |
1125 | 1122 | ) |
1126 | 1123 |
|
1127 | | - def test_warns_for_adaptive_retry_mode_under_crt( |
| 1124 | + def test_does_not_warn_for_adaptive_retry_mode_under_crt( |
1128 | 1125 | self, warn_unsupported_settings, auto_resolve_session |
1129 | 1126 | ): |
1130 | 1127 | stub_config_variables(auto_resolve_session, retry_mode='adaptive') |
1131 | | - warning = warn_unsupported_settings(constants.CRT_TRANSFER_CLIENT) |
1132 | | - assert f'retry_mode = {ADAPTIVE_RETRY_MODE}' in warning |
| 1128 | + assert warn_unsupported_settings(constants.CRT_TRANSFER_CLIENT) == '' |
1133 | 1129 |
|
1134 | 1130 | def test_does_not_warn_for_supported_retry_mode( |
1135 | 1131 | self, warn_unsupported_settings, auto_resolve_session |
@@ -1372,6 +1368,49 @@ def test_does_not_warn_when_crt_explicitly_preferred_with_retries_disabled( |
1372 | 1368 | ) |
1373 | 1369 | assert warning == '' |
1374 | 1370 |
|
| 1371 | + def test_maps_adaptive_retry_mode_to_crt_client( |
| 1372 | + self, crt_client_kwargs, auto_resolve_session |
| 1373 | + ): |
| 1374 | + stub_config_variables(auto_resolve_session, retry_mode='adaptive') |
| 1375 | + kwargs = crt_client_kwargs( |
| 1376 | + preferred_transfer_client=constants.CRT_TRANSFER_CLIENT |
| 1377 | + ) |
| 1378 | + assert kwargs['retry_options'] == { |
| 1379 | + 'retry_mode': awscrt.s3.S3RetryMode.ADAPTIVE |
| 1380 | + } |
| 1381 | + |
| 1382 | + def test_maps_adaptive_retry_mode_with_max_attempts( |
| 1383 | + self, crt_client_kwargs, auto_resolve_session |
| 1384 | + ): |
| 1385 | + stub_config_variables( |
| 1386 | + auto_resolve_session, retry_mode='adaptive', max_attempts=5 |
| 1387 | + ) |
| 1388 | + stub_configured_variables(auto_resolve_session, 'max_attempts') |
| 1389 | + assert crt_client_kwargs()['retry_options'] == { |
| 1390 | + 'retry_mode': awscrt.s3.S3RetryMode.ADAPTIVE, |
| 1391 | + 'max_retries': 4, |
| 1392 | + } |
| 1393 | + |
| 1394 | + def test_disabled_retries_take_precedence_over_adaptive( |
| 1395 | + self, crt_client_kwargs, auto_resolve_session |
| 1396 | + ): |
| 1397 | + stub_config_variables( |
| 1398 | + auto_resolve_session, retry_mode='adaptive', max_attempts=1 |
| 1399 | + ) |
| 1400 | + stub_configured_variables(auto_resolve_session, 'max_attempts') |
| 1401 | + assert crt_client_kwargs()['retry_options'] == { |
| 1402 | + 'retry_mode': awscrt.s3.S3RetryMode.NONE |
| 1403 | + } |
| 1404 | + |
| 1405 | + def test_does_not_map_standard_retry_mode( |
| 1406 | + self, crt_client_kwargs, auto_resolve_session |
| 1407 | + ): |
| 1408 | + stub_config_variables(auto_resolve_session, retry_mode='standard') |
| 1409 | + kwargs = crt_client_kwargs( |
| 1410 | + preferred_transfer_client=constants.CRT_TRANSFER_CLIENT |
| 1411 | + ) |
| 1412 | + assert 'retry_options' not in kwargs |
| 1413 | + |
1375 | 1414 | def test_maps_configured_max_attempts_to_crt_client( |
1376 | 1415 | self, crt_client_kwargs, auto_resolve_session |
1377 | 1416 | ): |
@@ -1699,8 +1738,12 @@ def test_awscrt_accepts_max_retries(self, max_retries): |
1699 | 1738 | retry_options={'max_retries': max_retries}, |
1700 | 1739 | ) |
1701 | 1740 |
|
1702 | | - def test_awscrt_accepts_none_retry_mode(self): |
| 1741 | + @pytest.mark.parametrize( |
| 1742 | + 'retry_mode', |
| 1743 | + [awscrt.s3.S3RetryMode.NONE, awscrt.s3.S3RetryMode.ADAPTIVE], |
| 1744 | + ) |
| 1745 | + def test_awscrt_accepts_retry_mode(self, retry_mode): |
1703 | 1746 | create_s3_crt_client( |
1704 | 1747 | region='us-west-2', |
1705 | | - retry_options={'retry_mode': awscrt.s3.S3RetryMode.NONE}, |
| 1748 | + retry_options={'retry_mode': retry_mode, 'max_retries': 4}, |
1706 | 1749 | ) |
0 commit comments