From ffd14af829bd3f7bf52cb0af5306550b51ab8712 Mon Sep 17 00:00:00 2001 From: Sujitha Date: Mon, 4 Apr 2016 22:59:23 +0000 Subject: [PATCH] Remove mox from tests/unit/compute/test_compute_xen.py This patch replaces mox with mock in tests/unit/compute/test_compute_xen.py. Part of blueprint remove-mox-newton Change-Id: Ia373e05ca9c82137924e443bfceaecb9f20a9c76 --- nova/tests/unit/compute/test_compute_xen.py | 36 +++++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/nova/tests/unit/compute/test_compute_xen.py b/nova/tests/unit/compute/test_compute_xen.py index 36d57bb6a3f1..d79e3feeb298 100644 --- a/nova/tests/unit/compute/test_compute_xen.py +++ b/nova/tests/unit/compute/test_compute_xen.py @@ -12,6 +12,7 @@ """Tests for expectations of behaviour from the Xen driver.""" +import mock from oslo_utils import importutils from nova.compute import power_state @@ -48,20 +49,27 @@ class ComputeXenTestCase(stubs.XenAPITestBaseNoDB): objects.InstanceList(), [db_instance], None) instance = instance_list[0] - self.mox.StubOutWithMock(objects.InstanceList, 'get_by_host') - self.mox.StubOutWithMock(self.compute.driver, 'get_num_instances') - self.mox.StubOutWithMock(vm_utils, 'lookup') - self.mox.StubOutWithMock(self.compute, '_sync_instance_power_state') + @mock.patch.object(vm_utils, 'lookup') + @mock.patch.object(objects.InstanceList, 'get_by_host') + @mock.patch.object(self.compute.driver, 'get_num_instances') + @mock.patch.object(self.compute, '_sync_instance_power_state') + def do_test(mock_compute_sync_powerstate, + mock_compute_get_num_instances, + mock_instance_list_get_by_host, + mock_vm_utils_lookup): + mock_instance_list_get_by_host.return_value = instance_list + mock_compute_get_num_instances.return_value = 1 + mock_vm_utils_lookup.return_value = None - objects.InstanceList.get_by_host(ctxt, - self.compute.host, expected_attrs=[], - use_slave=True).AndReturn(instance_list) - self.compute.driver.get_num_instances().AndReturn(1) - vm_utils.lookup(self.compute.driver._session, instance['name'], - False).AndReturn(None) - self.compute._sync_instance_power_state(ctxt, instance, - power_state.NOSTATE) + self.compute._sync_power_states(ctxt) - self.mox.ReplayAll() + mock_instance_list_get_by_host.assert_called_once_with( + ctxt, self.compute.host, expected_attrs=[], use_slave=True) + mock_compute_get_num_instances.assert_called_once_with() + mock_compute_sync_powerstate.assert_called_once_with( + ctxt, instance, power_state.NOSTATE, use_slave=True) + mock_vm_utils_lookup.assert_called_once_with( + self.compute.driver._session, instance['name'], + False) - self.compute._sync_power_states(ctxt) + do_test()