openstack/cinder
Code Issues Proposed changes

Merge "Remove redundant mock rpc statement"

Browse Source
This commit is contained in:
Jenkins 2017-08-03 21:56:27 +00:00 committed by Gerrit Code Review
commit 80b9150ccf
1 changed files with 80 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

194
cinder/tests/unit/api/contrib/test_qos_specs_manage.py
View File

@ -27,7 +27,6 @@ from cinder import objects
from cinder import test from cinder import test
from cinder.tests.unit.api import fakes from cinder.tests.unit.api import fakes
from cinder.tests.unit import fake_constants as fake from cinder.tests.unit import fake_constants as fake
from cinder.tests.unit import fake_notifier
def stub_qos_specs(id): def stub_qos_specs(id):
@ -274,10 +273,8 @@ class QoSSpecManageApiTest(test.TestCase):
def test_qos_specs_delete(self, mock_qos_delete, mock_qos_get_specs): def test_qos_specs_delete(self, mock_qos_delete, mock_qos_get_specs):
req = fakes.HTTPRequest.blank('/v2/%s/qos-specs/%s' % ( req = fakes.HTTPRequest.blank('/v2/%s/qos-specs/%s' % (
fake.PROJECT_ID, fake.QOS_SPEC_ID), use_admin_context=True) fake.PROJECT_ID, fake.QOS_SPEC_ID), use_admin_context=True)
notifier = fake_notifier.get_fake_notifier() self.controller.delete(req, fake.QOS_SPEC_ID)
with mock.patch('cinder.rpc.get_notifier', return_value=notifier): self.assertEqual(1, self.notifier.get_notification_count())
self.controller.delete(req, fake.QOS_SPEC_ID)
self.assertEqual(1, notifier.get_notification_count())
@mock.patch('cinder.volume.qos_specs.get_qos_specs', @mock.patch('cinder.volume.qos_specs.get_qos_specs',
side_effect=return_qos_specs_get_qos_specs) side_effect=return_qos_specs_get_qos_specs)
@ -285,16 +282,14 @@ class QoSSpecManageApiTest(test.TestCase):
side_effect=return_qos_specs_delete) side_effect=return_qos_specs_delete)
def test_qos_specs_delete_not_found(self, mock_qos_delete, def test_qos_specs_delete_not_found(self, mock_qos_delete,
mock_qos_get_specs): mock_qos_get_specs):
notifier = fake_notifier.get_fake_notifier() req = fakes.HTTPRequest.blank('/v2/%s/qos-specs/%s' %
with mock.patch('cinder.rpc.get_notifier', return_value=notifier): (fake.PROJECT_ID,
req = fakes.HTTPRequest.blank('/v2/%s/qos-specs/%s' % fake.WILL_NOT_BE_FOUND_ID),
(fake.PROJECT_ID, use_admin_context=True)
fake.WILL_NOT_BE_FOUND_ID), self.assertRaises(exception.QoSSpecsNotFound,
use_admin_context=True) self.controller.delete, req,
self.assertRaises(exception.QoSSpecsNotFound, fake.WILL_NOT_BE_FOUND_ID)
self.controller.delete, req, self.assertEqual(1, self.notifier.get_notification_count())
fake.WILL_NOT_BE_FOUND_ID)
self.assertEqual(1, notifier.get_notification_count())
@mock.patch('cinder.volume.qos_specs.get_qos_specs', @mock.patch('cinder.volume.qos_specs.get_qos_specs',
side_effect=return_qos_specs_get_qos_specs) side_effect=return_qos_specs_get_qos_specs)
@ -305,11 +300,9 @@ class QoSSpecManageApiTest(test.TestCase):
req = fakes.HTTPRequest.blank('/v2/%s/qos-specs/%s' % ( req = fakes.HTTPRequest.blank('/v2/%s/qos-specs/%s' % (
fake.PROJECT_ID, fake.IN_USE_ID), use_admin_context=True) fake.PROJECT_ID, fake.IN_USE_ID), use_admin_context=True)
notifier = fake_notifier.get_fake_notifier() self.assertRaises(webob.exc.HTTPBadRequest, self.controller.delete,
with mock.patch('cinder.rpc.get_notifier', return_value=notifier): req, fake.IN_USE_ID)
self.assertRaises(webob.exc.HTTPBadRequest, self.controller.delete, self.assertEqual(1, self.notifier.get_notification_count())
req, fake.IN_USE_ID)
self.assertEqual(1, notifier.get_notification_count())
@mock.patch('cinder.volume.qos_specs.get_qos_specs', @mock.patch('cinder.volume.qos_specs.get_qos_specs',
side_effect=return_qos_specs_get_qos_specs) side_effect=return_qos_specs_get_qos_specs)
@ -321,12 +314,10 @@ class QoSSpecManageApiTest(test.TestCase):
(fake.PROJECT_ID, fake.IN_USE_ID), (fake.PROJECT_ID, fake.IN_USE_ID),
use_admin_context=True) use_admin_context=True)
notifier = fake_notifier.get_fake_notifier() self.assertRaises(webob.exc.HTTPInternalServerError,
with mock.patch('cinder.rpc.get_notifier', return_value=notifier): self.controller.delete,
self.assertRaises(webob.exc.HTTPInternalServerError, req, fake.IN_USE_ID)
self.controller.delete, self.assertEqual(1, self.notifier.get_notification_count())
req, fake.IN_USE_ID)
self.assertEqual(1, notifier.get_notification_count())
def test_qos_specs_delete_with_invalid_force(self): def test_qos_specs_delete_with_invalid_force(self):
invalid_force = "invalid_bool" invalid_force = "invalid_bool"
@ -347,10 +338,8 @@ class QoSSpecManageApiTest(test.TestCase):
(fake.PROJECT_ID, fake.IN_USE_ID), (fake.PROJECT_ID, fake.IN_USE_ID),
use_admin_context=True) use_admin_context=True)
notifier = fake_notifier.get_fake_notifier() self.controller.delete_keys(req, fake.IN_USE_ID, body)
with mock.patch('cinder.rpc.get_notifier', return_value=notifier): self.assertEqual(1, self.notifier.get_notification_count())
self.controller.delete_keys(req, fake.IN_USE_ID, body)
self.assertEqual(1, notifier.get_notification_count())
@mock.patch('cinder.volume.qos_specs.delete_keys', @mock.patch('cinder.volume.qos_specs.delete_keys',
side_effect=return_qos_specs_delete_keys) side_effect=return_qos_specs_delete_keys)
@ -361,12 +350,10 @@ class QoSSpecManageApiTest(test.TestCase):
fake.WILL_NOT_BE_FOUND_ID), fake.WILL_NOT_BE_FOUND_ID),
use_admin_context=True) use_admin_context=True)
notifier = fake_notifier.get_fake_notifier() self.assertRaises(exception.QoSSpecsNotFound,
with mock.patch('cinder.rpc.get_notifier', return_value=notifier): self.controller.delete_keys,
self.assertRaises(exception.QoSSpecsNotFound, req, fake.WILL_NOT_BE_FOUND_ID, body)
self.controller.delete_keys, self.assertEqual(1, self.notifier.get_notification_count())
req, fake.WILL_NOT_BE_FOUND_ID, body)
self.assertEqual(1, notifier.get_notification_count())
@mock.patch('cinder.volume.qos_specs.delete_keys', @mock.patch('cinder.volume.qos_specs.delete_keys',
side_effect=return_qos_specs_delete_keys) side_effect=return_qos_specs_delete_keys)
@ -376,12 +363,10 @@ class QoSSpecManageApiTest(test.TestCase):
use_admin_context=True) use_admin_context=True)
body = {"keys": ['foo', 'zoo']} body = {"keys": ['foo', 'zoo']}
notifier = fake_notifier.get_fake_notifier() self.assertRaises(exception.QoSSpecsKeyNotFound,
with mock.patch('cinder.rpc.get_notifier', return_value=notifier): self.controller.delete_keys,
self.assertRaises(exception.QoSSpecsKeyNotFound, req, fake.IN_USE_ID, body)
self.controller.delete_keys, self.assertEqual(1, self.notifier.get_notification_count())
req, fake.IN_USE_ID, body)
self.assertEqual(1, notifier.get_notification_count())
@mock.patch('cinder.volume.qos_specs.delete_keys', @mock.patch('cinder.volume.qos_specs.delete_keys',
side_effect=return_qos_specs_delete_keys) side_effect=return_qos_specs_delete_keys)
@ -391,11 +376,8 @@ class QoSSpecManageApiTest(test.TestCase):
(fake.PROJECT_ID, fake.IN_USE_ID), (fake.PROJECT_ID, fake.IN_USE_ID),
use_admin_context=True) use_admin_context=True)
notifier = fake_notifier.get_fake_notifier() self.controller.delete_keys(req, fake.IN_USE_ID, body)
with mock.patch('cinder.rpc.get_notifier', return_value=notifier, self.assertEqual(1, self.notifier.get_notification_count())
autospec=True) as mock_get_notifier:
self.controller.delete_keys(req, fake.IN_USE_ID, body)
mock_get_notifier.assert_called_once_with('QoSSpecs')
@mock.patch('cinder.volume.qos_specs.create', @mock.patch('cinder.volume.qos_specs.create',
side_effect=return_qos_specs_create) side_effect=return_qos_specs_create)
@ -408,14 +390,12 @@ class QoSSpecManageApiTest(test.TestCase):
fake.PROJECT_ID, fake.PROJECT_ID,
use_admin_context=True) use_admin_context=True)
notifier = fake_notifier.get_fake_notifier() res_dict = self.controller.create(req, body)
with mock.patch('cinder.rpc.get_notifier', return_value=notifier):
res_dict = self.controller.create(req, body)
self.assertEqual(1, notifier.get_notification_count()) self.assertEqual(1, self.notifier.get_notification_count())
self.assertEqual('qos_specs_%s' % fake.QOS_SPEC_ID, self.assertEqual('qos_specs_%s' % fake.QOS_SPEC_ID,
res_dict['qos_specs']['name']) res_dict['qos_specs']['name'])
self.assertTrue(mock_validate.called) self.assertTrue(mock_validate.called)
@mock.patch('cinder.volume.qos_specs.create', @mock.patch('cinder.volume.qos_specs.create',
side_effect=return_qos_specs_create) side_effect=return_qos_specs_create)
@ -425,11 +405,9 @@ class QoSSpecManageApiTest(test.TestCase):
req = fakes.HTTPRequest.blank('/v2/%s/qos-specs' % fake.PROJECT_ID, req = fakes.HTTPRequest.blank('/v2/%s/qos-specs' % fake.PROJECT_ID,
use_admin_context=True) use_admin_context=True)
notifier = fake_notifier.get_fake_notifier() self.assertRaises(webob.exc.HTTPBadRequest,
with mock.patch('cinder.rpc.get_notifier', return_value=notifier): self.controller.create, req, body)
self.assertRaises(webob.exc.HTTPBadRequest, self.assertEqual(1, self.notifier.get_notification_count())
self.controller.create, req, body)
self.assertEqual(1, notifier.get_notification_count())
@mock.patch('cinder.volume.qos_specs.create', @mock.patch('cinder.volume.qos_specs.create',
side_effect=return_qos_specs_create) side_effect=return_qos_specs_create)
@ -439,11 +417,9 @@ class QoSSpecManageApiTest(test.TestCase):
req = fakes.HTTPRequest.blank('/v2/%s/qos-specs' % fake.PROJECT_ID, req = fakes.HTTPRequest.blank('/v2/%s/qos-specs' % fake.PROJECT_ID,
use_admin_context=True) use_admin_context=True)
notifier = fake_notifier.get_fake_notifier() self.assertRaises(webob.exc.HTTPConflict,
with mock.patch('cinder.rpc.get_notifier', return_value=notifier): self.controller.create, req, body)
self.assertRaises(webob.exc.HTTPConflict, self.assertEqual(1, self.notifier.get_notification_count())
self.controller.create, req, body)
self.assertEqual(1, notifier.get_notification_count())
@mock.patch('cinder.volume.qos_specs.create', @mock.patch('cinder.volume.qos_specs.create',
side_effect=return_qos_specs_create) side_effect=return_qos_specs_create)
@ -453,11 +429,9 @@ class QoSSpecManageApiTest(test.TestCase):
req = fakes.HTTPRequest.blank('/v2/%s/qos-specs' % fake.PROJECT_ID, req = fakes.HTTPRequest.blank('/v2/%s/qos-specs' % fake.PROJECT_ID,
use_admin_context=True) use_admin_context=True)
notifier = fake_notifier.get_fake_notifier() self.assertRaises(webob.exc.HTTPInternalServerError,
with mock.patch('cinder.rpc.get_notifier', return_value=notifier): self.controller.create, req, body)
self.assertRaises(webob.exc.HTTPInternalServerError, self.assertEqual(1, self.notifier.get_notification_count())
self.controller.create, req, body)
self.assertEqual(1, notifier.get_notification_count())
@ddt.data({'foo': {'a': 'b'}}, @ddt.data({'foo': {'a': 'b'}},
{'qos_specs': {'a': 'b'}}, {'qos_specs': {'a': 'b'}},
@ -496,63 +470,55 @@ class QoSSpecManageApiTest(test.TestCase):
@mock.patch('cinder.volume.qos_specs.update', @mock.patch('cinder.volume.qos_specs.update',
side_effect=return_qos_specs_update) side_effect=return_qos_specs_update)
def test_update(self, mock_qos_update): def test_update(self, mock_qos_update):
notifier = fake_notifier.get_fake_notifier() req = fakes.HTTPRequest.blank('/v2/%s/qos-specs/%s' %
with mock.patch('cinder.rpc.get_notifier', return_value=notifier): (fake.PROJECT_ID, fake.QOS_SPEC_ID),
req = fakes.HTTPRequest.blank('/v2/%s/qos-specs/%s' % use_admin_context=True)
(fake.PROJECT_ID, fake.QOS_SPEC_ID), body = {'qos_specs': {'key1': 'value1',
use_admin_context=True) 'key2': 'value2'}}
body = {'qos_specs': {'key1': 'value1', res = self.controller.update(req, fake.QOS_SPEC_ID, body)
'key2': 'value2'}} self.assertDictEqual(body, res)
res = self.controller.update(req, fake.QOS_SPEC_ID, body) self.assertEqual(1, self.notifier.get_notification_count())
self.assertDictEqual(body, res)
self.assertEqual(1, notifier.get_notification_count())
@mock.patch('cinder.volume.qos_specs.update', @mock.patch('cinder.volume.qos_specs.update',
side_effect=return_qos_specs_update) side_effect=return_qos_specs_update)
def test_update_not_found(self, mock_qos_update): def test_update_not_found(self, mock_qos_update):
notifier = fake_notifier.get_fake_notifier() req = fakes.HTTPRequest.blank('/v2/%s/qos-specs/%s' %
with mock.patch('cinder.rpc.get_notifier', return_value=notifier): (fake.PROJECT_ID,
req = fakes.HTTPRequest.blank('/v2/%s/qos-specs/%s' % fake.WILL_NOT_BE_FOUND_ID),
(fake.PROJECT_ID, use_admin_context=True)
fake.WILL_NOT_BE_FOUND_ID), body = {'qos_specs': {'key1': 'value1',
use_admin_context=True) 'key2': 'value2'}}
body = {'qos_specs': {'key1': 'value1', self.assertRaises(exception.QoSSpecsNotFound,
'key2': 'value2'}} self.controller.update,
self.assertRaises(exception.QoSSpecsNotFound, req, fake.WILL_NOT_BE_FOUND_ID, body)
self.controller.update, self.assertEqual(1, self.notifier.get_notification_count())
req, fake.WILL_NOT_BE_FOUND_ID, body)
self.assertEqual(1, notifier.get_notification_count())
@mock.patch('cinder.volume.qos_specs.update', @mock.patch('cinder.volume.qos_specs.update',
side_effect=return_qos_specs_update) side_effect=return_qos_specs_update)
def test_update_invalid_input(self, mock_qos_update): def test_update_invalid_input(self, mock_qos_update):
notifier = fake_notifier.get_fake_notifier() req = fakes.HTTPRequest.blank('/v2/%s/qos-specs/%s' %
with mock.patch('cinder.rpc.get_notifier', return_value=notifier): (fake.PROJECT_ID, fake.INVALID_ID),
req = fakes.HTTPRequest.blank('/v2/%s/qos-specs/%s' % use_admin_context=True)
(fake.PROJECT_ID, fake.INVALID_ID), body = {'qos_specs': {'key1': 'value1',
use_admin_context=True) 'key2': 'value2'}}
body = {'qos_specs': {'key1': 'value1', self.assertRaises(exception.InvalidQoSSpecs,
'key2': 'value2'}} self.controller.update,
self.assertRaises(exception.InvalidQoSSpecs, req, fake.INVALID_ID, body)
self.controller.update, self.assertEqual(1, self.notifier.get_notification_count())
req, fake.INVALID_ID, body)
self.assertEqual(1, notifier.get_notification_count())
@mock.patch('cinder.volume.qos_specs.update', @mock.patch('cinder.volume.qos_specs.update',
side_effect=return_qos_specs_update) side_effect=return_qos_specs_update)
def test_update_failed(self, mock_qos_update): def test_update_failed(self, mock_qos_update):
notifier = fake_notifier.get_fake_notifier() req = fakes.HTTPRequest.blank('/v2/%s/qos-specs/%s' %
with mock.patch('cinder.rpc.get_notifier', return_value=notifier): (fake.PROJECT_ID,
req = fakes.HTTPRequest.blank('/v2/%s/qos-specs/%s' % fake.UPDATE_FAILED_ID),
(fake.PROJECT_ID, use_admin_context=True)
fake.UPDATE_FAILED_ID), body = {'qos_specs': {'key1': 'value1',
use_admin_context=True) 'key2': 'value2'}}
body = {'qos_specs': {'key1': 'value1', self.assertRaises(webob.exc.HTTPInternalServerError,
'key2': 'value2'}} self.controller.update,
self.assertRaises(webob.exc.HTTPInternalServerError, req, fake.UPDATE_FAILED_ID, body)
self.controller.update, self.assertEqual(1, self.notifier.get_notification_count())
req, fake.UPDATE_FAILED_ID, body)
self.assertEqual(1, notifier.get_notification_count())
@mock.patch('cinder.volume.qos_specs.get_qos_specs', @mock.patch('cinder.volume.qos_specs.get_qos_specs',
side_effect=return_qos_specs_get_qos_specs) side_effect=return_qos_specs_get_qos_specs)