add safety check to verify that nomad_resp is indeed an requests.Response object and has text attribute. If not stringify given exception/value.

jonathanrcross · jonathanrcross · commit ff6e8dcefc57 · 2020-03-30T21:04:54.000-04:00
diff --git a/nomad/api/exceptions.py b/nomad/api/exceptions.py
@@ -1,10 +1,16 @@
+import requests
+
+
 class BaseNomadException(Exception):
     """General Error occurred when interacting with nomad API"""
     def __init__(self, nomad_resp):
         self.nomad_resp = nomad_resp
 
     def __str__(self):
-        return 'The {0} was raised with following response: {1}.'.format(self.__class__.__name__, self.nomad_resp.text)
+        if isinstance(self.nomad_resp, requests.Response) and hasattr(self.nomad_resp, "text"):
+            return 'The {0} was raised with following response: {1}.'.format(self.__class__.__name__, self.nomad_resp.text)
+        else:
+            return 'The {0} was raised due to the following error: {1}'.format(self.__class__.__name__,  str(self.nomad_resp))
 
 
 class URLNotFoundNomadException(BaseNomadException):
diff --git a/tests/test_base.py b/tests/test_base.py
@@ -46,6 +46,13 @@ def test_base_delete_connection_error():
         j = n.job.deregister_job("example")
 
 
+def test_base_raise_exception_():
+    n = nomad.Nomad(
+        host="162.16.10.102", port=common.NOMAD_PORT, timeout=0.001, verify=False)
+    with pytest.raises(nomad.api.exceptions.BaseNomadException):
+        j = n.job.deregister_job("example")
+
+
 @pytest.mark.skipif(tuple(int(i) for i in os.environ.get("NOMAD_VERSION").split(".")) < (0, 7, 0), reason="Nomad dispatch not supported")
 def test_base_get_connnection_not_authorized():
     n = nomad.Nomad(
