starlingx/distcloud
Code Issues Proposed changes

Merge "Update the mock methods in dcagent to use _mock_object"

Browse Source
This commit is contained in:
Zuul 2024-12-19 18:30:52 +00:00 committed by Gerrit Code Review
commit ddb0c2451c
2 changed files with 17 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
distributedcloud/dcagent/tests/api/controllers/v1/test_audit.py
View File

@ -23,8 +23,10 @@ from dcmanager.audit.software_audit import SoftwareAudit
class BaseTestAudit(DCAgentApiTest):
def setUp(self):
super().setUp()
self.url = "/v1/dcaudit"
self.method = self.app.patch_json
self._mock_object(utils, "CachedSysinvClient")
self._mock_object(utils, "CachedFmClient")
self._mock_object(utils, "KeystoneCache")
@ -82,51 +84,34 @@ class TestRequestedAudit(BaseTestAudit):
def setUp(self):
super().setUp()
mock_availability = mock.patch.object(
mock_availability = self._mock_object(
base_audit, "get_subcloud_availability_status"
)
self.mock_availability = mock_availability.start()
self.addCleanup(mock_availability.stop)
mock_alarm_aggregation = mock.patch.object(
mock_alarm_aggregation = self._mock_object(
AlarmAggregation, "get_alarm_summary"
)
self.mock_alarm_aggregation = mock_alarm_aggregation.start()
self.addCleanup(mock_alarm_aggregation.stop)
mock_software_audit = mock.patch.object(
mock_software_audit = self._mock_object(
SoftwareAudit, "get_subcloud_sync_status"
)
self.mock_software_audit = mock_software_audit.start()
self.addCleanup(mock_software_audit.stop)
mock_firmware_audit = mock.patch.object(
mock_firmware_audit = self._mock_object(
FirmwareAudit, "get_subcloud_sync_status"
)
self.mock_firmware_audit = mock_firmware_audit.start()
self.addCleanup(mock_firmware_audit.stop)
mock_kubernetes_audit = mock.patch.object(
mock_kubernetes_audit = self._mock_object(
KubernetesAudit, "get_subcloud_sync_status"
)
self.mock_kubernetes_audit = mock_kubernetes_audit.start()
self.addCleanup(mock_kubernetes_audit.stop)
mock_kube_rootca_audit = mock.patch.object(
mock_kube_rootca_audit = self._mock_object(
KubeRootcaUpdateAudit, "get_subcloud_sync_status"
)
self.mock_kube_rootca_audit = mock_kube_rootca_audit.start()
self.addCleanup(mock_kube_rootca_audit.stop)
# Mock responses for the external dependencies
mock_availability.return_value = ["online", []]
mock_alarm_aggregation.return_value = "test_alarm_summary"
mock_software_audit.return_value = "software_audit_response"
mock_firmware_audit.return_value = "firmware_audit_response"
mock_kubernetes_audit.return_value = "kubernetes_audit_response"
mock_kube_rootca_audit.return_value = "kube_rootca_audit_response"
def test_get_sync_status(self):
# Mock responses for the external dependencies
self.mock_availability.return_value = ["online", []]
self.mock_alarm_aggregation.return_value = "test_alarm_summary"
self.mock_software_audit.return_value = "software_audit_response"
self.mock_firmware_audit.return_value = "firmware_audit_response"
self.mock_kubernetes_audit.return_value = "kubernetes_audit_response"
self.mock_kube_rootca_audit.return_value = "kube_rootca_audit_response"
self.params = {
dccommon_consts.BASE_AUDIT: "",
dccommon_consts.FIRMWARE_AUDIT: "regionone_data_firmware",

10
distributedcloud/dcagent/tests/api/test_root_controller.py
View File

@ -7,7 +7,6 @@
import http.client
import uuid
import mock
from oslo_config import cfg
from oslo_config import fixture as fixture_config
from oslo_serialization import jsonutils
@ -41,7 +40,7 @@ class DCAgentApiTest(DCAgentTestCase):
self.CONF.set_override("auth_strategy", "noauth")
self.app = self._make_app()
self._mock_pecan()
self.mock_pecan_abort = self._mock_object(pecan, "abort", wraps=pecan.abort)
self.url = "/"
# The put method is used as a default value, leading to the generic
@ -99,13 +98,6 @@ class DCAgentApiTest(DCAgentTestCase):
if expected_response_text:
self.assertEqual(response.text, expected_response_text)
def _mock_pecan(self):
"""Mock pecan's abort"""
mock_patch_object = mock.patch.object(pecan, "abort", wraps=pecan.abort)
self.mock_pecan_abort = mock_patch_object.start()
self.addCleanup(mock_patch_object.stop)
def _assert_pecan(self, http_status, content=None, call_count=1):
"""Assert pecan was called with the correct arguments"""