Improve retry handling, config, test suite

Fixes #275 and improves test suite. Better documents the effect of WAIT_ON_RATE_LIMIT argument.

Author: TKIPisalegacycipher

meraki/config.py

@@ -22,6 +22,7 @@
 REQUESTS_PROXY = ""
 
 # Retry if 429 rate limit error encountered?
+# Please note, setting to False means your application will not retry upon a 429. Not intended for production apps.
 WAIT_ON_RATE_LIMIT = True
 
 # Nginx 429 retry wait time

meraki/rest_session.py

@@ -207,15 +207,18 @@ def request(self, metadata, method, url, **kwargs):
 
                 # Rate limit 429 errors
                 elif status == 429:
-                    if 'Retry-After' in response.headers:
-                        wait = int(response.headers['Retry-After'])
+                    # Retry if 429 retries are enabled and there are retries left
+                    if self._wait_on_rate_limit and retries > 0:
+                        if 'Retry-After' in response.headers:
+                            wait = int(response.headers['Retry-After'])
+                        else:
+                            wait = random.randint(1, self._nginx_429_retry_wait_time)
+                        if self._logger:
+                            self._logger.warning(f'{tag}, {operation} - {status} {reason}, retrying in {wait} seconds')
+                        time.sleep(wait)
+                        retries -= 1
+                    # We're either out of retries or the client told us not to retry
                     else:
-                        wait = random.randint(1, self._nginx_429_retry_wait_time)
-                    if self._logger:
-                        self._logger.warning(f'{tag}, {operation} - {status} {reason}, retrying in {wait} seconds')
-                    time.sleep(wait)
-                    retries -= 1
-                    if retries == 0:
                         raise APIError(metadata, response)
 
                 # 5XX errors
@@ -249,7 +252,7 @@ def handle_4xx_errors(self, metadata, operation, reason, response, retries, stat
             action_batch_errors = [error for error in message['errors'] if action_batch_concurrency_error_text in error]
 
             if network_deletion_errors:
-                wait = random.randint(30, self._network_delete_retry_wait_time)
+                wait = random.randint(10, self._network_delete_retry_wait_time)
                 if self._logger:
                     self._logger.warning(f'{tag}, {operation} - {status} {reason}, retrying in {wait} seconds')
                 time.sleep(wait)

tests/test_dashboard_api_python_library.py

@@ -14,7 +14,7 @@ def api_key(pytestconfig):
 
 @pytest.fixture(scope='session')
 def dashboard(api_key):
-    return meraki.DashboardAPI(api_key, suppress_logging=True, network_delete_retry_wait_time=600)
+    return meraki.DashboardAPI(api_key, suppress_logging=True, network_delete_retry_wait_time=600, maximum_retries=50)
 
 
 @pytest.fixture(scope='session')