fix: ensure hook added if client is re-set

Author: ricellis

ibmcloudant/cloudant_base_service.py

@@ -26,7 +26,7 @@
 
 from ibm_cloud_sdk_core import BaseService
 from ibm_cloud_sdk_core.authenticators import Authenticator
-from requests import Response
+from requests import Response, Session
 from requests.cookies import RequestsCookieJar
 
 from .common import get_sdk_headers
@@ -229,7 +229,11 @@ def set_service_url(self, service_url: str) -> None:
         except AttributeError:
             pass  # in case no authenticator is configured yet, pass
 
-def _add_hooks(self):
-    response_hooks = self.get_http_client().hooks['response']
-    if _error_response_hook not in response_hooks:
-        response_hooks.append(_error_response_hook)
+    def set_http_client(self, http_client: Session) -> None:
+        super().set_http_client(http_client)
+        self._add_hooks()
+
+    def _add_hooks(self):
+        response_hooks = self.get_http_client().hooks['response']
+        if _error_response_hook not in response_hooks:
+            response_hooks.append(_error_response_hook)

test/unit/test_cloudant_base_error_augment.py

@@ -167,7 +167,22 @@ def _response_callback(cls, resp):
         return _error_response_hook(resp)
 
     def test_response_hook_added(self):
-         self.assertEqual(_error_response_hook, self._service.get_http_client().hooks['response'][0])
+        self.assertEqual(_error_response_hook, self._service.get_http_client().hooks['response'][0])
+
+    def test_response_hook_not_double_added_via_set_http_client(self):
+        client = self._service.get_http_client()
+        self._service.set_http_client(client)
+        response_hooks =  self._service.get_http_client().hooks['response']
+        self.assertEqual(1, len(response_hooks))
+        self.assertEqual(_error_response_hook, response_hooks[0])
+
+    def test_response_hook_added_via_set_http_client(self):
+        client = self._service.get_http_client()
+        client.hooks['response'].clear()
+        self._service.set_http_client(client)
+        response_hooks =  self._service.get_http_client().hooks['response']
+        self.assertEqual(1, len(response_hooks))
+        self.assertEqual(_error_response_hook, response_hooks[0])
 
     def test_augment_error(self):
         self._run_test(