raise exception from do_api_call()

fixes #3356

Author: Vladimir Kotal

opengrok-tools/src/main/python/opengrok_tools/utils/restful.py

@@ -38,14 +38,24 @@ def do_api_call(verb, uri, params=None, headers=None, data=None):
     if handler is None or not callable(handler):
         raise Exception('Unknown HTTP verb: {}'.format(verb))
 
-    return handler(
+    logger = logging.getLogger(__name__)
+
+    logger.debug("{} API call: {} with data '{}' and headers: {}".
+                 format(verb, uri, data, headers))
+    r = handler(
         uri,
         data=data,
         params=params,
         headers=headers,
         proxies=get_proxies(uri)
     )
 
+    if r is not None:
+        logger.error("API call failed: {}".format(r))
+        r.raise_for_status()
+
+    return r
+
 
 def call_rest_api(command, pattern, name):
     """
@@ -100,10 +110,4 @@ def call_rest_api(command, pattern, name):
             data = data.replace(pattern, name)
         logger.debug("entity data: {}".format(data))
 
-    logger.debug("{} API call: {} with data '{}' and headers: {}".
-                 format(verb, uri, data, headers))
-    r = do_api_call(verb, uri, headers=headers, data=data)
-    if r is not None:
-        logger.debug("API call result: {}".format(r))
-        r.raise_for_status()
-    return r
+    return do_api_call(verb, uri, headers=headers, data=data)

opengrok-tools/src/test/python/test_command_sequence.py

@@ -168,15 +168,15 @@ def __init__(self):
             self.status_code = 500
             self.raise_for_status = self.p
 
-    def mock_response(verb, uri, headers, data):
+    def mock_response(uri, headers, data, params, proxies):
         return MockResponse()
 
     commands = CommandSequence(
         CommandSequenceBase("test-cleanup-list",
                             [{'command': ['http://foo', 'PUT', 'data']}]))
     assert commands is not None
     with monkeypatch.context() as m:
-        m.setattr("opengrok_tools.utils.restful.do_api_call",
+        m.setattr("requests.put",
                   mock_response)
         commands.run()
         assert commands.check([]) == 1

opengrok-tools/src/test/python/test_restful.py

@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2019-2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
 #
 
 import pytest
@@ -107,12 +107,11 @@ def __init__(self):
             self.status_code = 400
             self.raise_for_status = self.p
 
-    def mock_response(uri, verb, headers, data):
+    def mock_response(uri, headers, data, params, proxies):
         return MockResponse()
 
     with monkeypatch.context() as m:
-        m.setattr("opengrok_tools.utils.restful.do_api_call",
-                  mock_response)
+        m.setattr("requests.put", mock_response)
         with pytest.raises(HTTPError):
             call_rest_api({'command': ['http://foo', 'PUT', 'data']},
                           None, None)