diff --git a/nova_powervm/tests/virt/powervm/nvram/test_manager.py b/nova_powervm/tests/virt/powervm/nvram/test_manager.py index 600162ae..386e74ff 100644 --- a/nova_powervm/tests/virt/powervm/nvram/test_manager.py +++ b/nova_powervm/tests/virt/powervm/nvram/test_manager.py @@ -41,23 +41,25 @@ class TestNvramManager(test.NoDBTestCase): self.mock_exp_remove = self.useFixture( fixtures.MockPatchObject(self.fake_exp_store, 'delete')).mock - @mock.patch('nova_powervm.virt.powervm.nvram.manager.LOG.exception') - @mock.patch.object(vm, 'get_instance_wrapper') + @mock.patch('nova_powervm.virt.powervm.nvram.manager.LOG.exception', + autospec=True) + @mock.patch.object(vm, 'get_instance_wrapper', autospec=True) def test_store_with_exception(self, mock_get_inst, mock_log): mock_get_inst.side_effect = pvm_exc.HttpError(mock.Mock()) mgr = manager.NvramManager(self.fake_store, mock.Mock(), mock.Mock()) mgr.store(powervm.TEST_INST1.uuid) self.assertEqual(1, mock_log.call_count) - @mock.patch('nova_powervm.virt.powervm.nvram.manager.LOG.warning') - @mock.patch.object(vm, 'get_instance_wrapper') + @mock.patch('nova_powervm.virt.powervm.nvram.manager.LOG.warning', + autospec=True) + @mock.patch.object(vm, 'get_instance_wrapper', autospec=True) def test_store_with_not_found_exc(self, mock_get_inst, mock_log): mock_get_inst.side_effect = pvm_exc.HttpNotFound(mock.Mock()) mgr = manager.NvramManager(self.fake_store, mock.Mock(), mock.Mock()) mgr.store(powervm.TEST_INST1.uuid) - mock_log.assert_not_called() + self.assertEqual(0, mock_log.call_count) - @mock.patch.object(vm, 'get_instance_wrapper') + @mock.patch.object(vm, 'get_instance_wrapper', autospec=True) def test_manager(self, mock_get_inst): mgr = manager.NvramManager(self.fake_store, mock.Mock(), mock.Mock()) diff --git a/nova_powervm/tests/virt/powervm/nvram/test_swift.py b/nova_powervm/tests/virt/powervm/nvram/test_swift.py index 440cea01..cb59dc6a 100644 --- a/nova_powervm/tests/virt/powervm/nvram/test_swift.py +++ b/nova_powervm/tests/virt/powervm/nvram/test_swift.py @@ -89,7 +89,7 @@ class TestSwiftStore(test.NoDBTestCase): options={'long': True}) @mock.patch('nova_powervm.virt.powervm.nvram.swift.SwiftNvramStore.' - '_get_container_names') + '_get_container_names', autospec=True) def test_get_object_names(self, mock_container_names): with mock.patch.object(self.swift_store, '_run_operation') as mock_run: mock_run.return_value = self._build_results(['obj', 'obj2']) @@ -120,9 +120,9 @@ class TestSwiftStore(test.NoDBTestCase): # Second run should not increment the call count here self.assertEqual(mock_container_names.call_count, 2) - @mock.patch('swiftclient.service.SwiftUploadObject') + @mock.patch('swiftclient.service.SwiftUploadObject', autospec=True) @mock.patch('nova_powervm.virt.powervm.nvram.swift.SwiftNvramStore.' - '_exists') + '_exists', autospec=True) def test_underscore_store(self, mock_exists, mock_swiftuploadobj): mock_exists.return_value = True with mock.patch.object(self.swift_store, '_run_operation') as mock_run: @@ -154,9 +154,9 @@ class TestSwiftStore(test.NoDBTestCase): self.assertEqual(mock_run.call_count, 2) self.assertEqual(mock_swiftuploadobj.call_count, 2) - @mock.patch('swiftclient.service.SwiftUploadObject') + @mock.patch('swiftclient.service.SwiftUploadObject', autospec=True) @mock.patch('nova_powervm.virt.powervm.nvram.swift.SwiftNvramStore.' - '_exists') + '_exists', autospec=True) def test_underscore_store_not_exists(self, mock_exists, mock_swiftuploadobj): mock_exists.return_value = False @@ -183,7 +183,7 @@ class TestSwiftStore(test.NoDBTestCase): self.assertEqual(mock_swiftuploadobj.call_count, 2) @mock.patch('nova_powervm.virt.powervm.nvram.swift.SwiftNvramStore.' - '_exists') + '_exists', autospec=True) def test_store(self, mock_exists): # Test forcing a update with mock.patch.object(self.swift_store, '_store') as mock_store: @@ -215,10 +215,10 @@ class TestSwiftStore(test.NoDBTestCase): mock_store.assert_called_once_with( 'test_slot', 'data') - @mock.patch('os.remove') - @mock.patch('tempfile.NamedTemporaryFile') + @mock.patch('os.remove', autospec=True) + @mock.patch('tempfile.NamedTemporaryFile', autospec=True) @mock.patch('nova_powervm.virt.powervm.nvram.swift.SwiftNvramStore.' - '_exists') + '_exists', autospec=True) def test_fetch(self, mock_exists, mock_tmpf, mock_rmv): mock_exists.return_value = True with mock.patch('nova_powervm.virt.powervm.nvram.swift.open', @@ -237,10 +237,10 @@ class TestSwiftStore(test.NoDBTestCase): self.assertRaises(api.NVRAMDownloadException, self.swift_store.fetch, powervm.TEST_INST1) - @mock.patch('os.remove') - @mock.patch('tempfile.NamedTemporaryFile') + @mock.patch('os.remove', autospec=True) + @mock.patch('tempfile.NamedTemporaryFile', autospec=True) @mock.patch('nova_powervm.virt.powervm.nvram.swift.SwiftNvramStore.' - '_exists') + '_exists', autospec=True) def test_fetch_slot_map(self, mock_exists, mock_tmpf, mock_rmv): mock_exists.return_value = True with mock.patch('nova_powervm.virt.powervm.nvram.swift.open', @@ -254,10 +254,10 @@ class TestSwiftStore(test.NoDBTestCase): self.assertEqual('data to read', data) mock_rmv.assert_called_once_with(m_open.return_value.name) - @mock.patch('os.remove') - @mock.patch('tempfile.NamedTemporaryFile') + @mock.patch('os.remove', autospec=True) + @mock.patch('tempfile.NamedTemporaryFile', autospec=True) @mock.patch('nova_powervm.virt.powervm.nvram.swift.SwiftNvramStore.' - '_exists') + '_exists', autospec=True) def test_fetch_slot_map_no_exist(self, mock_exists, mock_tmpf, mock_rmv): mock_exists.return_value = False data = self.swift_store.fetch_slot_map("test_slot") @@ -294,7 +294,7 @@ class TestSwiftStore(test.NoDBTestCase): 'test_slot') @mock.patch('nova_powervm.virt.powervm.nvram.swift.SwiftNvramStore.' - '_get_object_names') + '_get_object_names', autospec=True) def test_exists(self, mock_get_obj_names): # Test where there are elements in here mock_get_obj_names.return_value = ['obj', 'obj1', 'obj2']