openstack
/
nova
Code Issues Proposed changes

Merge "Avoid modifying the Mock class in test"

This commit is contained in:
Zuul 2021-08-23 22:21:59 +00:00 committed by Gerrit Code Review
parent 84f137f52b 930b7c9921
commit 2d2fb2deba
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
nova/tests/unit/storage/test_rbd.py
View File

@ -119,13 +119,15 @@ class RbdTestCase(test.NoDBTestCase):
rados_patcher = mock.patch.object(rbd_utils, 'rados') rados_patcher = mock.patch.object(rbd_utils, 'rados')
self.mock_rados = rados_patcher.start() self.mock_rados = rados_patcher.start()
self.addCleanup(rados_patcher.stop) self.addCleanup(rados_patcher.stop)
self.mock_rados.Rados = mock.Mock self.mock_rados.Rados = mock.Mock()
self.mock_rados.Rados.ioctx = mock.Mock() self.rados_inst = mock.Mock()
self.mock_rados.Rados.connect = mock.Mock() self.mock_rados.Rados.return_value = self.rados_inst
self.mock_rados.Rados.shutdown = mock.Mock() self.rados_inst.ioctx = mock.Mock()
self.mock_rados.Rados.open_ioctx = mock.Mock() self.rados_inst.connect = mock.Mock()
self.mock_rados.Rados.open_ioctx.return_value = \ self.rados_inst.shutdown = mock.Mock()
self.mock_rados.Rados.ioctx self.rados_inst.open_ioctx = mock.Mock()
self.rados_inst.open_ioctx.return_value = \
self.rados_inst.ioctx
self.mock_rados.Error = Exception self.mock_rados.Error = Exception
rbd_patcher = mock.patch.object(rbd_utils, 'rbd') rbd_patcher = mock.patch.object(rbd_utils, 'rbd')
@ -339,33 +341,31 @@ class RbdTestCase(test.NoDBTestCase):
def test_connect_to_rados_default(self): def test_connect_to_rados_default(self):
ret = self.driver._connect_to_rados() ret = self.driver._connect_to_rados()
self.mock_rados.Rados.connect.assert_called_once_with( self.rados_inst.connect.assert_called_once_with(
timeout=self.rbd_connect_timeout) timeout=self.rbd_connect_timeout)
self.assertTrue(self.mock_rados.Rados.open_ioctx.called) self.assertTrue(self.rados_inst.open_ioctx.called)
self.assertIsInstance(ret[0], self.mock_rados.Rados) self.assertEqual(self.rados_inst.ioctx, ret[1])
self.assertEqual(self.mock_rados.Rados.ioctx, ret[1]) self.rados_inst.open_ioctx.assert_called_with(self.rbd_pool)
self.mock_rados.Rados.open_ioctx.assert_called_with(self.rbd_pool)
def test_connect_to_rados_different_pool(self): def test_connect_to_rados_different_pool(self):
ret = self.driver._connect_to_rados('alt_pool') ret = self.driver._connect_to_rados('alt_pool')
self.mock_rados.Rados.connect.assert_called_once_with( self.rados_inst.connect.assert_called_once_with(
timeout=self.rbd_connect_timeout) timeout=self.rbd_connect_timeout)
self.assertTrue(self.mock_rados.Rados.open_ioctx.called) self.assertTrue(self.rados_inst.open_ioctx.called)
self.assertIsInstance(ret[0], self.mock_rados.Rados) self.assertEqual(self.rados_inst.ioctx, ret[1])
self.assertEqual(self.mock_rados.Rados.ioctx, ret[1]) self.rados_inst.open_ioctx.assert_called_with('alt_pool')
self.mock_rados.Rados.open_ioctx.assert_called_with('alt_pool')
def test_connect_to_rados_error(self): def test_connect_to_rados_error(self):
self.mock_rados.Rados.open_ioctx.side_effect = self.mock_rados.Error self.rados_inst.open_ioctx.side_effect = self.mock_rados.Error
self.assertRaises(self.mock_rados.Error, self.assertRaises(self.mock_rados.Error,
self.driver._connect_to_rados) self.driver._connect_to_rados)
self.mock_rados.Rados.open_ioctx.assert_called_once_with( self.rados_inst.open_ioctx.assert_called_once_with(
self.rbd_pool) self.rbd_pool)
self.mock_rados.Rados.shutdown.assert_called_once_with() self.rados_inst.shutdown.assert_called_once_with()
def test_connect_to_rados_unicode_arg(self): def test_connect_to_rados_unicode_arg(self):
self.driver._connect_to_rados(u'unicode_pool') self.driver._connect_to_rados(u'unicode_pool')
self.mock_rados.Rados.open_ioctx.assert_called_with( self.rados_inst.open_ioctx.assert_called_with(
test.MatchType(str)) test.MatchType(str))
def test_ceph_args_none(self): def test_ceph_args_none(self):