Fix unit tests and appease linter

log2timeline · Nov 20, 2023 · 8eec57c · 8eec57c
1 parent fc9f780
commit 8eec57c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/dftimewolf/lib/processors/turbinia_base.py b/dftimewolf/lib/processors/turbinia_base.py
@@ -113,11 +113,10 @@ def _decode_api_response(self, data: Any) -> Any:
       if not data_attribute:
         if data_attribute := getattr(data, 'raw_data'):
           response = json.loads(data_attribute)
-      return response
     except (
       AttributeError, json.JSONDecodeError) as exception:
       self.ModuleError(str(exception), critical=True)
-
+    return response
 
   def _isInterestingPath(self, path: str) -> bool:
     """Checks if a path is interesting for the processor."""

diff --git a/tests/lib/processors/turbinia_base.py b/tests/lib/processors/turbinia_base.py
@@ -46,7 +46,7 @@ def setUp(self):
 
   # pylint: disable=line-too-long
   @mock.patch(
-      "turbinia_api_lib.api.turbinia_configuration_api.TurbiniaConfigurationApi.read_config"
+      "turbinia_api_lib.api.turbinia_configuration_api.TurbiniaConfigurationApi.read_config_with_http_info"
   )
   def testTurbiniaSetup(self, _mock_read_config):
     """Tests the TurbiniaSetup method."""
@@ -71,7 +71,7 @@ def testTurbiniaSetup(self, _mock_read_config):
 
   # pylint: disable=line-too-long
   @mock.patch(
-      "turbinia_api_lib.api.turbinia_requests_api.TurbiniaRequestsApi.create_request"
+      "turbinia_api_lib.api.turbinia_requests_api.TurbiniaRequestsApi.create_request_with_http_info"
   )
   def testTurbiniaStart(self, mock_create_request):
     """Tests the TurbiniaStart method."""
@@ -93,7 +93,7 @@ def testTurbiniaStart(self, mock_create_request):
 
   # pylint: disable=line-too-long
   @mock.patch(
-      "turbinia_api_lib.api.turbinia_requests_api.TurbiniaRequestsApi.get_request_status"
+      "turbinia_api_lib.api.turbinia_requests_api.TurbiniaRequestsApi.get_request_status_with_http_info"
   )
   @mock.patch("time.sleep")
   def testTurbiniaWait(self, mock_get_request_status, _):