openstack/python-openstackclient
Code Issues Proposed changes

Use assert_not_called() in common tests

Browse Source 
In https://review.openstack.org/#/c/273653/ Bryan Jones made
a point about using mock_sleep.assert_not_called() rather than
self.assertFalse(mock_sleep.called), so let's make that change
throughout these tests.

Change-Id: I826d608836955383891b303355edcca7b62faa16
This commit is contained in:
Dean Troyer 2016-02-03 15:45:55 -06:00
parent 5903ffff8a
commit 38ff51baef
1 changed files with 7 additions and 7 deletions

14
openstackclient/tests/common/test_utils.py

@ -143,7 +143,7 @@ class TestUtils(test_utils.TestCase):
status_f = mock.Mock(return_value=resource) status_f = mock.Mock(return_value=resource)
res_id = str(uuid.uuid4()) res_id = str(uuid.uuid4())
self.assertTrue(utils.wait_for_status(status_f, res_id,)) self.assertTrue(utils.wait_for_status(status_f, res_id,))
self.assertFalse(mock_sleep.called) mock_sleep.assert_not_called()
@mock.patch.object(time, 'sleep') @mock.patch.object(time, 'sleep')
def test_wait_for_status_ok__with_overrides(self, mock_sleep): def test_wait_for_status_ok__with_overrides(self, mock_sleep):
@ -154,7 +154,7 @@ class TestUtils(test_utils.TestCase):
self.assertTrue(utils.wait_for_status(status_f, res_id, self.assertTrue(utils.wait_for_status(status_f, res_id,
status_field='my_status', status_field='my_status',
success_status=['complete'])) success_status=['complete']))
self.assertFalse(mock_sleep.called) mock_sleep.assert_not_called()
@mock.patch.object(time, 'sleep') @mock.patch.object(time, 'sleep')
def test_wait_for_status_error(self, mock_sleep): def test_wait_for_status_error(self, mock_sleep):
@ -163,7 +163,7 @@ class TestUtils(test_utils.TestCase):
status_f = mock.Mock(return_value=resource) status_f = mock.Mock(return_value=resource)
res_id = str(uuid.uuid4()) res_id = str(uuid.uuid4())
self.assertFalse(utils.wait_for_status(status_f, res_id)) self.assertFalse(utils.wait_for_status(status_f, res_id))
self.assertFalse(mock_sleep.called) mock_sleep.assert_not_called()
@mock.patch.object(time, 'sleep') @mock.patch.object(time, 'sleep')
def test_wait_for_status_error_with_overrides(self, mock_sleep): def test_wait_for_status_error_with_overrides(self, mock_sleep):
@ -174,7 +174,7 @@ class TestUtils(test_utils.TestCase):
self.assertFalse(utils.wait_for_status(status_f, res_id, self.assertFalse(utils.wait_for_status(status_f, res_id,
status_field='my_status', status_field='my_status',
error_status=['failed'])) error_status=['failed']))
self.assertFalse(mock_sleep.called) mock_sleep.assert_not_called()
@mock.patch.object(time, 'sleep') @mock.patch.object(time, 'sleep')
def test_wait_for_delete_ok(self, mock_sleep): def test_wait_for_delete_ok(self, mock_sleep):
@ -210,7 +210,7 @@ class TestUtils(test_utils.TestCase):
manager = mock.MagicMock(get=mock_get) manager = mock.MagicMock(get=mock_get)
res_id = str(uuid.uuid4()) res_id = str(uuid.uuid4())
self.assertFalse(utils.wait_for_delete(manager, res_id)) self.assertFalse(utils.wait_for_delete(manager, res_id))
self.assertFalse(mock_sleep.called) mock_sleep.assert_not_called()
@mock.patch.object(time, 'sleep') @mock.patch.object(time, 'sleep')
def test_wait_for_delete_error_with_overrides(self, mock_sleep): def test_wait_for_delete_error_with_overrides(self, mock_sleep):
@ -222,7 +222,7 @@ class TestUtils(test_utils.TestCase):
self.assertFalse(utils.wait_for_delete(manager, res_id, self.assertFalse(utils.wait_for_delete(manager, res_id,
status_field='my_status', status_field='my_status',
error_status=['failed'])) error_status=['failed']))
self.assertFalse(mock_sleep.called) mock_sleep.assert_not_called()
@mock.patch.object(time, 'sleep') @mock.patch.object(time, 'sleep')
def test_wait_for_delete_error_with_overrides_exception(self, mock_sleep): def test_wait_for_delete_error_with_overrides_exception(self, mock_sleep):
@ -232,7 +232,7 @@ class TestUtils(test_utils.TestCase):
res_id = str(uuid.uuid4()) res_id = str(uuid.uuid4())
self.assertTrue(utils.wait_for_delete(manager, res_id, self.assertTrue(utils.wait_for_delete(manager, res_id,
exception_name=['Exception'])) exception_name=['Exception']))
self.assertFalse(mock_sleep.called) mock_sleep.assert_not_called()
def test_build_kwargs_dict_value_set(self): def test_build_kwargs_dict_value_set(self):
self.assertEqual({'arg_bla': 'bla'}, self.assertEqual({'arg_bla': 'bla'},