openstack/ironic
Code Issues Proposed changes

Use more granular mocking in test_utils

Browse Source 
oslo.config will start using the same functions that we mock in its
next release, breaking our assumptions on how many times they are
called.

Change-Id: Ief2c3d3089916e021cfef38f45f2cc2c78bc4f9b
Closes-Bug: #1754026
This commit is contained in:
Dmitry Tantsur 2018-03-12 12:32:38 +01:00
parent 9ecaa1bbcb
commit ac65ec6a6e
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ironic/tests/unit/common/test_utils.py
View File

@ -418,27 +418,31 @@ class TempFilesTestCase(base.TestCase):
mock_dir_writable.assert_called_once_with('/fake/path') mock_dir_writable.assert_called_once_with('/fake/path')
mock_free_space.assert_called_once_with('/fake/path', 5) mock_free_space.assert_called_once_with('/fake/path', 5)
@mock.patch.object(os.path, 'exists', autospec=True)
@mock.patch.object(utils, '_check_dir_writable', autospec=True) @mock.patch.object(utils, '_check_dir_writable', autospec=True)
@mock.patch.object(utils, '_check_dir_free_space', autospec=True) @mock.patch.object(utils, '_check_dir_free_space', autospec=True)
def test_check_dir_no_dir(self, mock_free_space, mock_dir_writable, def test_check_dir_no_dir(self, mock_free_space, mock_dir_writable):
mock_exists):
mock_exists.return_value = False
self.config(tempdir='/fake/path') self.config(tempdir='/fake/path')
self.assertRaises(exception.PathNotFound, utils.check_dir) # NOTE(dtantsur): self.config uses os.path.exists, so we cannot mock
mock_exists.assert_called_once_with(CONF.tempdir) # on the method level.
with mock.patch.object(os.path, 'exists',
autospec=True) as mock_exists:
mock_exists.return_value = False
self.assertRaises(exception.PathNotFound, utils.check_dir)
mock_exists.assert_called_once_with(CONF.tempdir)
self.assertFalse(mock_free_space.called) self.assertFalse(mock_free_space.called)
self.assertFalse(mock_dir_writable.called) self.assertFalse(mock_dir_writable.called)
@mock.patch.object(os.path, 'exists', autospec=True)
@mock.patch.object(utils, '_check_dir_writable', autospec=True) @mock.patch.object(utils, '_check_dir_writable', autospec=True)
@mock.patch.object(utils, '_check_dir_free_space', autospec=True) @mock.patch.object(utils, '_check_dir_free_space', autospec=True)
def test_check_dir_ok(self, mock_free_space, mock_dir_writable, def test_check_dir_ok(self, mock_free_space, mock_dir_writable):
mock_exists):
mock_exists.return_value = True
self.config(tempdir='/fake/path') self.config(tempdir='/fake/path')
utils.check_dir() # NOTE(dtantsur): self.config uses os.path.exists, so we cannot mock
mock_exists.assert_called_once_with(CONF.tempdir) # on the method level.
with mock.patch.object(os.path, 'exists',
autospec=True) as mock_exists:
mock_exists.return_value = True
utils.check_dir()
mock_exists.assert_called_once_with(CONF.tempdir)
mock_dir_writable.assert_called_once_with(CONF.tempdir) mock_dir_writable.assert_called_once_with(CONF.tempdir)
mock_free_space.assert_called_once_with(CONF.tempdir, 1) mock_free_space.assert_called_once_with(CONF.tempdir, 1)