From 2d4c77aa6852e75e1b2db578be6e74abbee4a3a1 Mon Sep 17 00:00:00 2001 From: songwenping Date: Fri, 10 Dec 2021 10:26:47 +0000 Subject: [PATCH] Fill the exception msg Change-Id: Ia3fde144fafbe4f036a14258e713ac830239592f --- nova/tests/unit/virt/zvm/test_driver.py | 14 +++++++++----- nova/tests/unit/virt/zvm/test_guest.py | 2 +- nova/tests/unit/virt/zvm/test_hypervisor.py | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/nova/tests/unit/virt/zvm/test_driver.py b/nova/tests/unit/virt/zvm/test_driver.py index 5e847c23d5..85a8a5227c 100644 --- a/nova/tests/unit/virt/zvm/test_driver.py +++ b/nova/tests/unit/virt/zvm/test_driver.py @@ -130,7 +130,7 @@ class TestZVMDriver(test.NoDBTestCase): @mock.patch('nova.virt.zvm.utils.ConnectorClient.call') def test_get_available_resource_err_case(self, call): res = {'overallRC': 1, 'errmsg': 'err', 'rc': 0, 'rs': 0} - call.side_effect = exception.ZVMConnectorError(res) + call.side_effect = exception.ZVMConnectorError(results=res) results = self._driver.get_available_resource() self.assertEqual(0, results['vcpus']) self.assertEqual(0, results['memory_mb_used']) @@ -151,10 +151,14 @@ class TestZVMDriver(test.NoDBTestCase): @mock.patch('nova.virt.zvm.utils.ConnectorClient.call') def test_private_get_image_info_err(self, call): res = {'overallRC': 500, 'errmsg': 'err', 'rc': 0, 'rs': 0} - call.side_effect = exception.ZVMConnectorError(res) - self.assertRaises(exception.ZVMConnectorError, - self._driver._get_image_info, - 'context', 'image_meta_id', 'os_distro') + call.side_effect = exception.ZVMConnectorError(results=res) + ex = self.assertRaises(exception.ZVMConnectorError, + self._driver._get_image_info, + 'context', 'image_meta_id', 'os_distro') + self.assertEqual(ex.overallRC, res['overallRC']) + self.assertEqual(ex.errmsg, res['errmsg']) + self.assertEqual(ex.rc, res['rc']) + self.assertEqual(ex.rs, res['rs']) @mock.patch('nova.virt.zvm.utils.ConnectorClient.call') @mock.patch('nova.virt.zvm.driver.ZVMDriver._import_spawn_image') diff --git a/nova/tests/unit/virt/zvm/test_guest.py b/nova/tests/unit/virt/zvm/test_guest.py index 5f4175158a..029f211ea4 100644 --- a/nova/tests/unit/virt/zvm/test_guest.py +++ b/nova/tests/unit/virt/zvm/test_guest.py @@ -65,7 +65,7 @@ class TestZVMGuestOp(test.NoDBTestCase): @mock.patch('nova.virt.zvm.utils.ConnectorClient.call') def test_get_info_err_general(self, call): res = {'overallRC': 500, 'errmsg': 'err', 'rc': 0, 'rs': 0} - call.side_effect = exception.ZVMConnectorError(res) + call.side_effect = exception.ZVMConnectorError(results=res) self.assertRaises(exception.ZVMConnectorError, self._guest.get_info) @mock.patch('nova.virt.zvm.utils.ConnectorClient.call') diff --git a/nova/tests/unit/virt/zvm/test_hypervisor.py b/nova/tests/unit/virt/zvm/test_hypervisor.py index 3bf19f7d42..d2081d49e2 100644 --- a/nova/tests/unit/virt/zvm/test_hypervisor.py +++ b/nova/tests/unit/virt/zvm/test_hypervisor.py @@ -59,7 +59,7 @@ class TestZVMHypervisor(test.NoDBTestCase): @mock.patch('nova.virt.zvm.utils.ConnectorClient.call') def test_get_available_resource_err_case(self, call): res = {'overallRC': 1, 'errmsg': 'err', 'rc': 0, 'rs': 0} - call.side_effect = exception.ZVMConnectorError(res) + call.side_effect = exception.ZVMConnectorError(results=res) results = self._hypervisor.get_available_resource() # Should return an empty dict self.assertFalse(results)