Merge pull request #201 from ericscobell/develop

Allow setting `HTTPAdapter.pool_maxsize` without `retries`

Author: HardNorth

reportportal_client/client.py

@@ -15,7 +15,7 @@
 
 import logging
 import requests
-from requests.adapters import HTTPAdapter, Retry
+from requests.adapters import HTTPAdapter, Retry, DEFAULT_RETRIES
 
 from ._local import set_current
 from .core.rp_requests import (
@@ -100,16 +100,16 @@ def __init__(self,
         self.step_reporter = StepReporter(self)
         self._item_stack = []
         self.mode = mode
-        if retries:
-            retry_strategy = Retry(
-                total=retries,
-                backoff_factor=0.1,
-                status_forcelist=[429, 500, 502, 503, 504]
-            )
-            self.session.mount('https://', HTTPAdapter(
-                max_retries=retry_strategy, pool_maxsize=max_pool_size))
-            self.session.mount('http://', HTTPAdapter(
-                max_retries=retry_strategy, pool_maxsize=max_pool_size))
+
+        retry_strategy = Retry(
+            total=retries,
+            backoff_factor=0.1,
+            status_forcelist=[429, 500, 502, 503, 504]
+        ) if retries else DEFAULT_RETRIES
+        self.session.mount('https://', HTTPAdapter(
+            max_retries=retry_strategy, pool_maxsize=max_pool_size))
+        self.session.mount('http://', HTTPAdapter(
+            max_retries=retry_strategy, pool_maxsize=max_pool_size))
         self.session.headers['Authorization'] = 'bearer {0}'.format(self.token)
 
         self._log_manager = LogManager(

reportportal_client/service.py

@@ -590,4 +590,4 @@ def _log_batch(self, log_data, force=False):
             "Report Portal Batch Log request failed after %d attempts",
             POST_LOGBATCH_RETRY_COUNT,
             exc_info=exceptions[-1]
-        )
+        )