Fixing Minimum Uptime (Azure#33616)

* Fixing min uptime. Renamed

* missed name change

* renamed again

* Update CHANGELOG.md

Author: mrm9084

sdk/appconfiguration/azure-appconfiguration-provider/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Release History
 
-## 1.1.0b3 (2023-12-18)
+## 1.1.0b3 (2023-12-19)
 
 ### Features Added
 

sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/_azureappconfigurationprovider.py

@@ -194,7 +194,7 @@ def load(*args, **kwargs) -> "AzureAppConfigurationProvider":
     try:
         provider._load_all(headers=headers)
     except Exception as e:
-        _prekill(start_time)
+        _delay_failure(start_time)
         raise e
 
     # Refresh-All sentinels are not updated on load_all, as they are not necessarily included in the provider.
@@ -212,21 +212,21 @@ def load(*args, **kwargs) -> "AzureAppConfigurationProvider":
                         label,
                     )
                 else:
-                    _prekill(start_time)
+                    _delay_failure(start_time)
                     raise e
             except Exception as e:
-                _prekill(start_time)
+                _delay_failure(start_time)
                 raise e
     return provider
 
 
-def _prekill(start_time: datetime.datetime) -> None:
+def _delay_failure(start_time: datetime.datetime) -> None:
     # We want to make sure we are up a minimum amount of time before we kill the process. Otherwise, we could get stuck
     # in a quick restart loop.
     min_time = datetime.timedelta(seconds=min_uptime)
     current_time = datetime.datetime.now()
     if current_time - start_time < min_time:
-        time.sleep(min_time - (current_time - start_time))
+        time.sleep((min_time - (current_time - start_time)).total_seconds())
 
 
 def _get_headers(request_type, **kwargs) -> str:

sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/aio/_azureappconfigurationproviderasync.py

@@ -44,7 +44,7 @@
     _get_headers,
     _RefreshTimer,
     _build_sentinel,
-    _prekill,
+    _delay_failure,
 )
 from .._user_agent import USER_AGENT
 
@@ -194,7 +194,7 @@ async def load(*args, **kwargs) -> "AzureAppConfigurationProvider":
     try:
         await provider._load_all(headers=headers)
     except Exception as e:
-        _prekill(start_time)
+        _delay_failure(start_time)
         raise e
 
     # Refresh-All sentinels are not updated on load_all, as they are not necessarily included in the provider.
@@ -213,10 +213,10 @@ async def load(*args, **kwargs) -> "AzureAppConfigurationProvider":
                     )
                     provider._refresh_on[(key, label)] = None
                 else:
-                    _prekill(start_time)
+                    _delay_failure(start_time)
                     raise e
             except Exception as e:
-                _prekill(start_time)
+                _delay_failure(start_time)
                 raise e
     return provider
 

sdk/appconfiguration/azure-appconfiguration-provider/tests/test_provider.py

@@ -10,7 +10,11 @@
 import datetime
 from unittest.mock import patch
 
-from azure.appconfiguration.provider._azureappconfigurationprovider import _prekill
+from azure.appconfiguration.provider._azureappconfigurationprovider import _delay_failure
+
+
+def sleep(seconds):
+    assert isinstance(seconds, float)
 
 
 class TestAppConfigurationProvider(AppConfigTestCase):
@@ -108,16 +112,16 @@ def test_provider_secret_resolver_options(self, appconfiguration_connection_stri
         )
         assert client["secret"] == "Reslover Value"
 
-    # method: _prekill
-    @patch("time.sleep")
-    def test_prekill(self, mock_sleep, **kwargs):
+    # method: _delay_failure
+    @patch("time.sleep", side_effect=sleep)
+    def test_delay_failure(self, mock_sleep, **kwargs):
         start_time = datetime.datetime.now()
-        _prekill(start_time)
+        _delay_failure(start_time)
         assert mock_sleep.call_count == 1
 
         mock_sleep.reset_mock()
         start_time = datetime.datetime.now() - datetime.timedelta(seconds=10)
-        _prekill(start_time)
+        _delay_failure(start_time)
         mock_sleep.assert_not_called()